Merge "[automerger skipped] Merge changes Ib9a15fec,I9f3f2588 into qt-dev am: f4a435aca0 am: 3d7da92f91 -s ours
am: 6015da41ff -s ours
am skip reason: change_id Ib9a15fececd8579fc5b139fe0341275a45512e0f with SHA1 6edf86cd9c is in history
Change-Id: Ic4a71618bfa8d431bdbfcde3892499c50cd2e6fc
This commit is contained in: