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

Bug: 142003500
Change-Id: I44971e5f6b9c2ff6eaa46a78537c60d6f020e074