am b20d54b2: Merge "fix double closing file descriptors"

* commit 'b20d54b2309adee8d192942015740735ded975d3':
  fix double closing file descriptors