am 7842cff8: am 787d8145: am 4a794846: Merge "Fix descriptor leak after accepting connections"

* commit '7842cff88dd519d5eba6ff86e21f9ce616d9ad9b':
  Fix descriptor leak after accepting connections