am ed217967: Merge "Fix socket_network_client_timeout error check."

* commit 'ed21796754c4879bedaa1a479ae288dda6dad478':
  Fix socket_network_client_timeout error check.