[automerger skipped] Merge changes I92f6d977,I06840834 into qt-dev
am: b05b4d609f -s ours
am skip reason: change_id Ibcb91105e46f7e898b8aa7c2babc3344ef2c6257 with SHA1 e5c3c8cccd is in history

Change-Id: I64a66b8c08963428d409908f93c1d557fd9e4ff6