Merge "Remove explicit dependencies on "core" libraries"