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

Bug: 142003500
Change-Id: I881e2a3f4fbabb8bb5ca3959a22748508ce23f58