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

Change-Id: Id9937523e436f8cb308b7c435349b79eab8ef035