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