[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: bfbb28f836 -s ours am: 9cda868da9

Change-Id: Ieb14bd28064d8d0033711f0ede81752ba6f9ddea