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

Bug: 151763422
Change-Id: I3f472c50b7d4c584b8766e1f21804fbe05ab9582