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

Bug: 151763422
Change-Id: Ia3a8b40225d4074459dd022f49c13b2bd3ad4cc0