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

Change-Id: I34e85cadce561885d3240e95997c5ce815ffa0fd