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

Change-Id: Iec550f0f8c036d34c9178ef91b74058df250da3b