Merge "Fix ModuleInfoProviderTest by passing correct flag"