[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: df8f05569b -s ours am: 4d98362e21 am: 6f2a075609

Change-Id: Ieedc5f43d8d30e89d839d017716f48be2e5d5b28