[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 0a0fec058c -s ours am: 67aedc68c6 am: 0b2e6b269a

Change-Id: I5671fd0f35a0d2a45fe72b342e62be7ede579ace