[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d05861c775 -s ours am: 6e8e1b545b am: 8e91a3b1e8

Change-Id: Ibf5960073314a3a39cd7c6eb427b0873d0133fbc