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