Merge "Fixed incorrect class names in golden serialized files for EnumSetTest and EnumMapTest"