[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 194d5579b6 -s ours am: e22f9fe5d2 am: fdc76c2ca7 am: e4504bc3af -s ours am: 5b34f39946

Change-Id: Id3a460ea2b5fc047c14001fc2a019f4ea74c3e77