Merge "Rename CommonModuleInfoKey to be consistent with others." into main