[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: bc2c965574 -s ours am: 506335de19 am: 69afb6b861

Change-Id: I917fde089ee793ae089d6a8d5a99375bfb80bc15