DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master

Bug: 151763422
Change-Id: Ic31fef9d9c105a3cfc4911beed19b5af7fc702e5