am 598e833d: am b20d54b2: Merge "fix double closing file descriptors"

* commit '598e833d42a687259bc3c9a5a39ad9ba8b105cbb':
  fix double closing file descriptors