Merge "correct enum_default_value_name on atoms.proto"