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

Change-Id: Iac23323824d920d6023d2332a9a2739ec0c27f97