[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 9b1d369210 -s ours am: 358e38f269 am: 66335a243d

Change-Id: Ib4ebac7e5359b63094c4329e1352c5e6a1540ae3