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

Change-Id: I9841900fd587d6ae42bef00788ca346c6143c296