DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master

Bug: 142003500
Change-Id: I53b1a32f9ad28ef83770ce7ad4ea2ed8f5e75ae5