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