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

Change-Id: I64703d9686828c7073299e00804b6942ac7ae018