[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 5b891107e7 -s ours am: 83c9adf1b5

Change-Id: Ia776b8bf170b8294459056ee9b0ea0e5c4d27143