[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 7942353ca5 -s ours am: 2865d19bc3

Change-Id: I93a57277b2416165631cd6bd8bc4afa68fbe607f