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

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