[automerger skipped] Merge changes I1aa11f40,Ia707a806 into qt-dev am: c0c0fd95ea -s ours am: 7da9d91719 -s ours
am: 9b2b6f02a7 -s ours
am skip reason: change_id I1aa11f40d930fd736b4b149e9e21be6b0c952e07 with SHA1 47527b5f28 is in history

Change-Id: Ib9e4e1322f77e7851ab1681630ef00d14d47d1ef