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

Bug: 151763422
Change-Id: Ide4ca8e8ad14c39185af3d0c113ec44390a469d3