Merge "Take module APIs out of the module_current stubs"