[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: e11d9392bd -s ours am: 95cb831257 am: 6660b194f5

Change-Id: Ia4efb145f65fd59e338ed11df983eb87de7c564c