am 11092bce: am ca1294f4: am 54a6667f: am 9bab2d1c: Merge "FileSystemPermissionTest: Add directories" * commit '11092bce': FileSystemPermissionTest: Add directories