[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 8dcde7c421 -s ours am: 293b5e6501 am: 5a21202d9d

Change-Id: I3f68d7ca835016c5ea004dc332c4f22c89f58018