[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 4bdb6b4692 -s ours am: 259a66ed42 am: 6a7a222e1e

Change-Id: I4206b1d46bd6c1532929b4fb4e17a6aece428565