am 7c556549: Merge changes Icdefb5ff,Icd7f5f03

* commit '7c556549079dbcc3f6f7ef4376978cd8c598aa62':
  Fix potential race introduced in Icd7f5f03
  SocketClient: add optional reference counting