[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 0e91ab7436 -s ours am: 91aa955476

Change-Id: Iefdca367d7a0ec4f9a99fe7f316c9041d93ce01b