[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d742a0de21 -s ours am: 32bce2cc49 am: fa09eb4655

Change-Id: Iea9d7a8d875cdfa72f2d37d10076528cbb2f2dd7