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

Change-Id: Ia99d25f477b7f0ab297ca36ea9c0126d6b7dd5c3