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

Change-Id: I74f2963df26fc0bc195b2b52652c04ada7ca74e6