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