[automerger skipped] Merge changes I1aa11f40,Ia707a806 into qt-dev am:...
[automerger skipped] Merge changes I1aa11f40,Ia707a806 into qt-dev am: c0c0fd95 am: 139b8b9f -s ours
am: 802475cf -s ours
am skip reason: change_id I1aa11f40d930fd736b4b149e9e21be6b0c952e07 with SHA1 47527b5f is in history
Change-Id: Ic080119806ecd73618c934f1a3e9469c415804bb