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

Change-Id: Iccf535c69440a2d301a7a74b7f6101551783e2c9