[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: b740c5e12e -s ours am: 44f2e45de2 am: 5ea97f6f5b

Change-Id: I677a7f4b89077c5f506baa38fe08723119b58f9a