diff --git a/.gitmodules b/.gitmodules
index 3e271d679..3222a3d13 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,3 @@
 [submodule "temporal-serviceclient/src/main/proto"]
 	path = temporal-serviceclient/src/main/proto
 	url = https://github.com/temporalio/api.git
-	hexsha = ddf07ab9933e8230309850e3c579e1ff34b03f53
diff --git a/gradle/licensing.gradle b/gradle/licensing.gradle
index 1750cee2b..00b4aae75 100644
--- a/gradle/licensing.gradle
+++ b/gradle/licensing.gradle
@@ -5,7 +5,7 @@ subprojects {
     apply plugin: 'org.cadixdev.licenser'
     license {
         header rootProject.file('LICENSE.header')
-        exclude '**/*.puml', 'io/temporal/api', 'gogoproto/Gogo.java'
+        exclude '**/*.puml', 'io/temporal/api', 'com/google/protobuf', 'com/google/api','gogoproto/Gogo.java'
 
     }
     tasks.check.dependsOn('checkLicenseMain')
diff --git a/temporal-sdk/src/main/java/io/temporal/internal/sync/SyncWorkflowContext.java b/temporal-sdk/src/main/java/io/temporal/internal/sync/SyncWorkflowContext.java
index fb8ed08d0..78a3b714b 100644
--- a/temporal-sdk/src/main/java/io/temporal/internal/sync/SyncWorkflowContext.java
+++ b/temporal-sdk/src/main/java/io/temporal/internal/sync/SyncWorkflowContext.java
@@ -552,7 +552,7 @@ private ExecuteActivityParameters constructExecuteActivityParameters(
     attributes.setHeader(grpcHeader);
 
     if (options.getVersioningIntent() != null) {
-      attributes.setUseCompatibleVersion(
+      attributes.setUseWorkflowBuildId(
           options
               .getVersioningIntent()
               .determineUseCompatibleFlag(
@@ -765,7 +765,7 @@ private StartChildWorkflowExecutionParameters createChildWorkflowParameters(
     }
 
     if (options.getVersioningIntent() != null) {
-      attributes.setUseCompatibleVersion(
+      attributes.setInheritBuildId(
           options
               .getVersioningIntent()
               .determineUseCompatibleFlag(
@@ -1131,7 +1131,7 @@ public void continueAsNew(ContinueAsNewInput input) {
                 .putAllFields(intoPayloadMap(dataConverterWithCurrentWorkflowContext, memo)));
       }
       if (options.getVersioningIntent() != null) {
-        attributes.setUseCompatibleVersion(
+        attributes.setInheritBuildId(
             options
                 .getVersioningIntent()
                 .determineUseCompatibleFlag(
diff --git a/temporal-serviceclient/src/main/proto b/temporal-serviceclient/src/main/proto
index cfa1a15b9..2227a14f4 160000
--- a/temporal-serviceclient/src/main/proto
+++ b/temporal-serviceclient/src/main/proto
@@ -1 +1 @@
-Subproject commit cfa1a15b960920a47de8ec272873a4ee4db574c4
+Subproject commit 2227a14f482ae48fc440a5e9829cf6797009d5b8