[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 2c9b848640 -s ours am: debc372e9f

Change-Id: I42eace1d07f5ec9940840f337cf907e562bd939f