Merge "LocalFileTest does not require database access"