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

Bug: 151763422
Change-Id: Ie2524df08e3b5fcc3aef25ac9496ef944314fd9e