am 86bd038a: Merge "Fix a possible file descriptor leakage"

* commit '86bd038a3242bb645b2625f64941a642d9414b91':
  Fix a possible file descriptor leakage