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

Change-Id: Ibe5c614f979249ef97d967971e951f2519fe8f4f