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

Bug: 151763422
Change-Id: I6a57be77d33e2ce434334679ee21e37cc25a2ab2