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

Change-Id: I8cf004ae4d89e6d07cf0b8b2477fe4aa6f072346