[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 194d5579b6 -s ours am: e22f9fe5d2

Change-Id: Ice1cf2890abd972633e7f398d2f1c9859deedf97