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

Change-Id: Ia471f17e270a950fd55592d93212fca9ad311d05