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