Merge "Implement ModuleInfoProvider"