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

Bug: 142003500
Change-Id: I5e4cf2c58cfd8d7fd689eab8200444c66547ed10