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

Bug: 151763422
Change-Id: Ie72b0e772eb11d8c5990c1c83987cb5a659d36ca