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

Change-Id: I9019f4b56f6b4e413992d846f57448a7123a0706