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

Bug: 151763422
Change-Id: If712d1190d06284ea3a7a3aaaae6b809c2fc792d