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