am 092c8863: am 7a28c6d7: Merge "FileSystemPermissionTest: Add directories"

* commit '092c8863c76d3695d5552c1decd8005101baf240':
  FileSystemPermissionTest: Add directories