Merge "Fix typo in cleanup_service class name"