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

Change-Id: I0d245bf8446a4a3500a98f7d1a8945098527f4ab