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

Change-Id: I6579e55702806ec1cbd24ffb7b52244cc3bfc1dc