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

Change-Id: I7c467651b74e98eff869f46eccf504aae8235d14