am 30ad1e57: am 9dbef975: Merge "Avoid leaking sockets." into gingerbread

* commit '30ad1e576a445b8ffec12ef148f5d7253ebb6ef4':
  Avoid leaking sockets.