[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 3a2c4cfa8b -s ours am: 00bdb4cbbb

Change-Id: I3282d595e6a9ed73a8637babfb0c3fe16f239a8c