Merge "Convert variant suffix to module_name_overrides." into main