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