[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 6defbe27c0 -s ours am: 9abeca4cbc am: 58ea4dbe4e

Change-Id: Id69bd247fd613ebf4a1167481e43f78ff4ce26bd