Merge "Convert proto3 to proto2 to avoid forced zero enum value."