Merge "Return correct domains in cleanup service"