[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: d18cd3b052 -s ours am: 28d4536ca5

Change-Id: I45617a524ac3e3c3e0e7441f8c2f46b7e8d89f50