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