Merge "Use ApexInfo.moduleName"