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