[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 6314209690 -s ours am: 800d69926b am: 8f22f633f2

Change-Id: I31d0931a7d8145070736cba56b1d90b913297a90