Merge "DO NOT MERGE FileSystemPermissionTest Froyo Backport" into froyo