[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 69e476290c -s ours am: a025d830e6 am: e827769263 am: 477656d880 -s ours am: ca58fd4fb9

Change-Id: I391351e8b1b3715a64d412431347f3bef7e59a1c