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

Change-Id: I07e753914cb5a25a51cf1738305f566652b03012