[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d7dac7298c -s ours am: d0293cd9ba am: 507a8f0d52

Change-Id: Ieb4d489b65df3abea0440066ade3ee900ea8601c