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

Bug: 142003500
Change-Id: I83b5f60cb9ec5d127cd9dbf7cd36d9f6b19144cc