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

Bug: 151763422
Change-Id: I427abb5c9c7146b02b164eb93a105b56f9ecff86