[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: c2c2a13316 -s ours am: df4dc934fd am: e09047ec79

Change-Id: I5d31e8fa645341e14f036f6fffa836e864826f65