[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: d0b639e3f5 -s ours am: e8315fc0dd am: 212a2cb12c

Change-Id: Ie4c71a8d63ad5fbbe0c6d2a198d4d88dafe18c68