[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 4d9791454b -s ours am: 4f533320d4

Change-Id: I28ba5b079748c60153601b5e745665b8e3b8da94