[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: beed480907 -s ours am: 4deb3d2e2c

Change-Id: Id842babbed0e0d2982cca2bcbf41c8be3c2ea041