am 39ad9f56: Merge "Defer closing idle sockets." into ics-mr1

* commit '39ad9f5657323d3852f6741c79b830019baba4a8':
  Defer closing idle sockets.