[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: ffa4acffa4 -s ours am: 63ac507929

Change-Id: Ia7d4769d8c6d0d5c0e8976b6e70345b9e4bd2264