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

Bug: 142003500
Change-Id: I6e3ee6c45ba613fe86cfe452d9d090cbfdeba6c4