DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master

Bug: 151763422
Change-Id: Id9183f069aa5a701880bceacec86f3d34dbdd7fd