am 1e81f9d6: am 91e931fb: am 85e2e94c: Merge "Close files after reading them"

* commit '1e81f9d66eceed57976b81f12822d877cc722098':
  Close files after reading them