DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master

Bug: 151763422
Change-Id: I20adf6dbe4a87ed2ba3e2aec086be79e5a2159dc