Merge "FileSystemPermissionTest: Add directories" into jb-dev