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

Change-Id: I85df34c44e3bd3686aa16f96120632e4ced74652