Merge "Use a longer timeout for service registration"