[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 12e4973a91 -s ours am: 0c32278962 am: a3f6c8dd6a

Change-Id: I07f8f7a0534c7bde97a782f706e2bfdc23bee0e5