[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: eb3b5d800a -s ours am: 505ac05bcc

Change-Id: I60ea4d8369737313db2527eaddead5d70813c0e4