am 34d2f109: am 409542cd: Merge "FileSource: FILE is not closed"

* commit '34d2f10908526cf3011d6c167a5817522b5a24d7':
  FileSource: FILE is not closed