Merge "Cleanup USER_OWNER in backup service"