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

Bug: 142003500
Change-Id: Ie84bd99dbd5f3c70c8127ee425c1c8def3d66ebf