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

Bug: 151763422
Change-Id: Iaeff56dfa77dc2594d2572b6b60633d0d379caa7