DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master Bug: 146167222 Change-Id: Iaf8ec32308fada0a0a399a5e0bc20ced55c73db7