am 4355a31e: Merge "FileSystemPermissionTest: Add directories" into jb-dev

* commit '4355a31efff85e96ca83864a8b330cab52e05a60':
  FileSystemPermissionTest: Add directories