Merge "Revert "Ignore LegacyFileAccessTest""