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

Change-Id: I824bcd831604ecc6fb762801d0c0b5890c9d6e76