[automerger skipped] Merge changes Ib9a15fec,I9f3f2588 into qt-dev am: f4a435ac
am: 3d7da92f -s ours
am skip reason: change_id Ib9a15fececd8579fc5b139fe0341275a45512e0f with SHA1 ac955b31 is in history
Change-Id: Icc72ee8aa8a51abe3072c3dabed450cef094e418