[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: d4eef49c06 -s ours am: 82e0a5abfd am: 6e523d84f6

Change-Id: I2f36c9f8c92b5b48808eac88773510b3b69c9dfc