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

Bug: 142003500
Change-Id: I190b6dcea3636b7e3150597b51dfc6fb7d6400ad