Merge "Restore more missing DirectoryFragment functionality."