This reverts commit 6224e238. Reason for revert: b/119659731 Change-Id: I33ea82d69d09f113d594446f8979f0df21200662