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

Bug: 151763422
Change-Id: I2d329c817ad05d18b8ac1deaf105b8811bfe7f89