[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 8d0ad56b27 -s ours am: 350b992147 am: 1b453347c1

Change-Id: Idc6856a675072ccda0b4063a14c26361d9661ce6