Merge "Fix socket_network_client_timeout error check."