am 12d912bc: am ed217967: Merge "Fix socket_network_client_timeout error check."

* commit '12d912bc4facd9490becd9d1306a54fd079a8800':
  Fix socket_network_client_timeout error check.