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

Bug: 142003500
Change-Id: I2f1a15fdc7576fc7f648dd9eb1ca62a34967ab47