[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 58d082ff97 -s ours am: 67012670f8 am: 10c9843bf3

Change-Id: I7e740d371fd7400bbe6b64ded268e9eaeba93728