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

Change-Id: Idbcfe381f246a6d9c7e9ef3c51150f6f2a065230