[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: a0a308b353 -s ours am: 1bb47f45b8 am: 1059c07da3

Change-Id: Idb82aaf623c44203e2b6e62c59c2e956ca698469