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

Bug: 142003500
Change-Id: I97e01fe59ed4583b1ccf1ebbf193020c96b4ad73