[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: f2b775744b -s ours am: cb01ccf7e5 am: 63ed50eadb

Change-Id: Ie2e4fc4be6204108bbfd0551a0b1213cdd89a4a1