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

Change-Id: Id87348a8f17ecded92d4cebe3d77958254966687