Merge "Use addClassResourceCleanup for cleanup of service"