chore: merge main into generate-libraries-main

Author: cloud-java-bot

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/SkipTrailersTest.java

@@ -46,7 +46,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.BytesValue;
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.Message;
 import com.google.protobuf.StringValue;
 import io.grpc.BindableService;
 import io.grpc.MethodDescriptor;
@@ -252,15 +252,13 @@ public ServerServiceDefinition bindService() {
                   BigtableGrpc.getReadRowsMethod(),
                   ServerCalls.asyncServerStreamingCall(
                       (req, observer) -> rpcs.add(ServerRpc.create(req, observer))));
-      ImmutableList<MethodDescriptor<? extends GeneratedMessageV3, ? extends GeneratedMessageV3>>
-          unaryDescriptors =
-              ImmutableList.of(
-                  BigtableGrpc.getMutateRowMethod(),
-                  BigtableGrpc.getCheckAndMutateRowMethod(),
-                  BigtableGrpc.getReadModifyWriteRowMethod());
-
-      for (MethodDescriptor<? extends GeneratedMessageV3, ? extends GeneratedMessageV3> desc :
-          unaryDescriptors) {
+      ImmutableList<MethodDescriptor<? extends Message, ? extends Message>> unaryDescriptors =
+          ImmutableList.of(
+              BigtableGrpc.getMutateRowMethod(),
+              BigtableGrpc.getCheckAndMutateRowMethod(),
+              BigtableGrpc.getReadModifyWriteRowMethod());
+
+      for (MethodDescriptor<? extends Message, ? extends Message> desc : unaryDescriptors) {
         builder.addMethod(
             desc.toBuilder().setType(MethodDescriptor.MethodType.SERVER_STREAMING).build(),
             ServerCalls.asyncServerStreamingCall(