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