Merge "Start retiring socket_loopback_client."