diff --git a/build.gradle b/build.gradle
index a4dc8475f6..4e66c44447 100644
--- a/build.gradle
+++ b/build.gradle
@@ -403,7 +403,7 @@ task createToolPaths {
     DependencyResolver resolver = new DependencyResolver(project)
 
     def protoGenGrpcJavaExe = resolver.resolveExecutable(
-            'io.grpc:protoc-gen-grpc-java:1.10.0')
+            'io.grpc:protoc-gen-grpc-java:1.30.2')
     Symlinks.createSymbolicLink("$buildDir/toolpaths/protoGenGrpcJavaExe", protoGenGrpcJavaExe)
 
     def protobufJavaDir = resolver.extractArchive(
diff --git a/dependencies.properties b/dependencies.properties
index 9a5fe3bdd1..28f8512130 100644
--- a/dependencies.properties
+++ b/dependencies.properties
@@ -7,7 +7,7 @@
 # Target workspace name: com_google_api_codegen
 
 # Versions only, for dependencies which actual artifacts differ between Bazel and Gradle
-version.com_google_protobuf=3.9.1
+version.com_google_protobuf=3.12.0
 version.google_java_format=1.6
 
 # Maven artifacts.
diff --git a/src/test/java/com/google/api/codegen/gapic/testdata/nodejs/nodejs_library.baseline b/src/test/java/com/google/api/codegen/gapic/testdata/nodejs/nodejs_library.baseline
index ea4877ac54..62849c8adf 100644
--- a/src/test/java/com/google/api/codegen/gapic/testdata/nodejs/nodejs_library.baseline
+++ b/src/test/java/com/google/api/codegen/gapic/testdata/nodejs/nodejs_library.baseline
@@ -3298,7 +3298,7 @@ const Any = {
  *     if (duration.seconds < 0 && duration.nanos > 0) {
  *       duration.seconds += 1;
  *       duration.nanos -= 1000000000;
- *     } else if (durations.seconds > 0 && duration.nanos < 0) {
+ *     } else if (duration.seconds > 0 && duration.nanos < 0) {
  *       duration.seconds -= 1;
  *       duration.nanos += 1000000000;
  *     }
@@ -3608,7 +3608,7 @@ const Empty = {
  *
  * The implementation of any API method which has a FieldMask type field in the
  * request should verify the included field paths, and return an
- * `INVALID_ARGUMENT` error if any path is duplicated or unmappable.
+ * `INVALID_ARGUMENT` error if any path is unmappable.
  *
  * @property {string[]} paths
  *   The set of field mask paths.
diff --git a/src/test/java/com/google/api/codegen/gapic/testdata/ruby/ruby_library.baseline b/src/test/java/com/google/api/codegen/gapic/testdata/ruby/ruby_library.baseline
index 056d89ff63..f6131c8b7c 100644
--- a/src/test/java/com/google/api/codegen/gapic/testdata/ruby/ruby_library.baseline
+++ b/src/test/java/com/google/api/codegen/gapic/testdata/ruby/ruby_library.baseline
@@ -1386,7 +1386,7 @@ module Google
     #     if (duration.seconds < 0 && duration.nanos > 0) {
     #       duration.seconds += 1;
     #       duration.nanos -= 1000000000;
-    #     } else if (durations.seconds > 0 && duration.nanos < 0) {
+    #     } else if (duration.seconds > 0 && duration.nanos < 0) {
     #       duration.seconds -= 1;
     #       duration.nanos += 1000000000;
     #     }
@@ -1683,7 +1683,7 @@ module Google
     #
     # The implementation of any API method which has a FieldMask type field in the
     # request should verify the included field paths, and return an
-    # `INVALID_ARGUMENT` error if any path is duplicated or unmappable.
+    # `INVALID_ARGUMENT` error if any path is unmappable.
     # @!attribute [rw] paths
     #   @return [Array<String>]
     #     The set of field mask paths.
diff --git a/src/test/java/com/google/api/codegen/protoannotations/testdata/nodejs_library.baseline b/src/test/java/com/google/api/codegen/protoannotations/testdata/nodejs_library.baseline
index 2877dfad47..859864bd14 100644
--- a/src/test/java/com/google/api/codegen/protoannotations/testdata/nodejs_library.baseline
+++ b/src/test/java/com/google/api/codegen/protoannotations/testdata/nodejs_library.baseline
@@ -4102,7 +4102,7 @@ const Any = {
  *     if (duration.seconds < 0 && duration.nanos > 0) {
  *       duration.seconds += 1;
  *       duration.nanos -= 1000000000;
- *     } else if (durations.seconds > 0 && duration.nanos < 0) {
+ *     } else if (duration.seconds > 0 && duration.nanos < 0) {
  *       duration.seconds -= 1;
  *       duration.nanos += 1000000000;
  *     }
@@ -4412,7 +4412,7 @@ const Empty = {
  *
  * The implementation of any API method which has a FieldMask type field in the
  * request should verify the included field paths, and return an
- * `INVALID_ARGUMENT` error if any path is duplicated or unmappable.
+ * `INVALID_ARGUMENT` error if any path is unmappable.
  *
  * @property {string[]} paths
  *   The set of field mask paths.
diff --git a/src/test/java/com/google/api/codegen/protoannotations/testdata/ruby_library.baseline b/src/test/java/com/google/api/codegen/protoannotations/testdata/ruby_library.baseline
index a1e3babd92..c68a463f09 100644
--- a/src/test/java/com/google/api/codegen/protoannotations/testdata/ruby_library.baseline
+++ b/src/test/java/com/google/api/codegen/protoannotations/testdata/ruby_library.baseline
@@ -1386,7 +1386,7 @@ module Google
     #     if (duration.seconds < 0 && duration.nanos > 0) {
     #       duration.seconds += 1;
     #       duration.nanos -= 1000000000;
-    #     } else if (durations.seconds > 0 && duration.nanos < 0) {
+    #     } else if (duration.seconds > 0 && duration.nanos < 0) {
     #       duration.seconds -= 1;
     #       duration.nanos += 1000000000;
     #     }
@@ -1683,7 +1683,7 @@ module Google
     #
     # The implementation of any API method which has a FieldMask type field in the
     # request should verify the included field paths, and return an
-    # `INVALID_ARGUMENT` error if any path is duplicated or unmappable.
+    # `INVALID_ARGUMENT` error if any path is unmappable.
     # @!attribute [rw] paths
     #   @return [Array<String>]
     #     The set of field mask paths.
diff --git a/src/test/java/com/google/api/codegen/protoannotations/testdata/ruby_library_no_gapic_config.baseline b/src/test/java/com/google/api/codegen/protoannotations/testdata/ruby_library_no_gapic_config.baseline
index 367eed4af6..0a916f70a7 100644
--- a/src/test/java/com/google/api/codegen/protoannotations/testdata/ruby_library_no_gapic_config.baseline
+++ b/src/test/java/com/google/api/codegen/protoannotations/testdata/ruby_library_no_gapic_config.baseline
@@ -1266,7 +1266,7 @@ module Google
     #     if (duration.seconds < 0 && duration.nanos > 0) {
     #       duration.seconds += 1;
     #       duration.nanos -= 1000000000;
-    #     } else if (durations.seconds > 0 && duration.nanos < 0) {
+    #     } else if (duration.seconds > 0 && duration.nanos < 0) {
     #       duration.seconds -= 1;
     #       duration.nanos += 1000000000;
     #     }
@@ -1563,7 +1563,7 @@ module Google
     #
     # The implementation of any API method which has a FieldMask type field in the
     # request should verify the included field paths, and return an
-    # `INVALID_ARGUMENT` error if any path is duplicated or unmappable.
+    # `INVALID_ARGUMENT` error if any path is unmappable.
     # @!attribute [rw] paths
     #   @return [Array<String>]
     #     The set of field mask paths.