[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: 21095c0a13 -s ours am: 6a806bf542 am: cfcef3f0bb

Change-Id: I2248bdfb30cd220abad97e80a24b7e81b3232025