[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: 08c3df80ef -s ours am: 3b5d8ae696 am: 3f2c4bc89d

Change-Id: I5171cadb5dd2e6a65f77d0d7de1a353d53756112