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

Bug: 151763422
Change-Id: I7bb4ab25034f6c28b5f4295d8b2b6e44aca1a75a