Merge "Support ModuleProxy in OtherModuleType, OtherModuleErrorf. Also removed OtherModuleSubDir." into main