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

Change-Id: I62332493d289f64f2181b708c171dd06eb4f037a