[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: f77b1a4f33 -s ours am: db35733692 am: bb1c432fff

Change-Id: I2cd23eb599bc80f2f5520b42508242865e8ad0df