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

Change-Id: I915754e2be7dec571fa73bc3f470663c4067ba4f