[automerger skipped] Merge changes I60b9e9ae,I8be89116 into qt-dev am: 8702c1454d -s ours am: 9fe83529b8 -s ours
am:33dd370165-s ours am skip reason: change_id I60b9e9ae9cf2b63490493ced9738cd2f402c3f9b with SHA180ec50b8aeis in history Change-Id: If89cdbe56a37a6e70ae4e29adb3f87ab86ee36c0
This commit is contained in: