[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: be503f0867 -s ours am: 4628be3846 am: e37a595e7e

Change-Id: I8533567a11ceb47786180ca451a063ddf16bc40c