[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 530a08c526 -s ours am: 5de870be1d am: 059c27ce5a

Change-Id: I750dde1b97a631ccac5f64c545f09b4f9c1c531f