[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3
-s ours am: 56274ffaa3
am: 1e2416d458
am: 5f99e79af4
am: 2febd6e59f
Change-Id: Id0997a6e4a479dd8905cbe34c082c019a3b4bc15
This commit is contained in: