DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 0a934061cf Change-Id: I53d5e1341a3df2970d6a448efef8c37ab3adb44e