DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master

Bug: 142003500
Change-Id: I4a4f05885e0c24050ecf8aeae6c1ab43b1c28f59