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

* commit '188753b3fbf417a2701d23cf30183f304aced358':
  Close files after reading them