[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 075431a3e0 -s ours am: 659e4afbfc

Change-Id: I335c2c429a86ea277fa6f737590d8a60bfbcc7c2