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

Change-Id: I60306d82cee4e64c142c5ef537e3da56a187b2b7