[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: e5ec49b51d -s ours am: 8d15f33f94

Change-Id: If600f0c5aa8cb11bf96dc87b8378cc89c79752fd