[automerger skipped] Merge "DO NOT MERGE" into qt-qpr1-dev am: 8697de6be3 -s ours

am skip reason: subject contains skip directive

Change-Id: I17465ae7a650f532680446dc72eb315b9e16ba2d