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

Change-Id: Id2a880645b2a6eeb488fdfc88131418e0345afe1