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

Change-Id: I3d569f2ae97256644da8d3367a915e47e76d758e