Merge "FileSystemPermissionTest: Add directories"