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

Bug: 151763422
Change-Id: I9f325f6845b7f54c2f4ec9e9389ce1b2596f5c0c