am 7bb1b958: am ff856a2b: Merge "Add error handling to SocketClient::sendData"

* commit '7bb1b9585d2d61beaf05c997971aee27f87ad3f7':
  Add error handling to SocketClient::sendData