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

Bug: 142003500
Change-Id: I48640713aa19f01f5b26e9bf3f27bd8bb1a0fec8