am 5ce11a16: am 1eebc534: am 092c8863: am 7a28c6d7: Merge "FileSystemPermissionTest: Add directories"

* commit '5ce11a16ede48b2609443fdbc95d754d82477c78':
  FileSystemPermissionTest: Add directories