am cb1e616e: am 7c556549: Merge changes Icdefb5ff,Icd7f5f03

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