[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 2fc2488744 -s ours am: c73aebe3b4 am: 85090d0fea

Change-Id: I04bf603940ba73d2e5f5d55640bdf6b0a5b1c1b7