Merge "[automerger skipped] Merge changes I80bebcd0,I35f3718f into qt-dev am: 08793a3b64 am: a63b604929 -s ours
am: 0b37d21e1f -s ours
am skip reason: change_id Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80 with SHA1 a1f7931360 is in history

Change-Id: Ibb2e2d45f5ace7a4e738daf79ff2947631133068