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

Change-Id: Ie08db102b621963854063f4168d26f6268db8ca9