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

Bug: 151763422
Change-Id: Iacd01ed13376a67e61c9aeef95b28068cf2c334b