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

Change-Id: I4eb4e4480c5db52a6365462ae18db089cb0e999f