[automerger skipped] Merge changes I80bebcd0,I35f3718f into qt-dev
am:08793a3b64-s ours am skip reason: change_id Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80 with SHA1a1f7931360is in history Change-Id: I9094b83959e1f75f90edac095060240c129b73b0
This commit is contained in: