am 60186ada: Merge "File: Test file-system encodings of files."

* commit '60186adad03687e671d8d4c3f4aa80e1d2d029b7':
  File: Test file-system encodings of files.