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

Change-Id: Iec2a42f1a71a4b5e2e9515228e9a058e09258df5