diff --git a/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java b/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java
index 8c2ca268eb..40440d7ee0 100644
--- a/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java
+++ b/src/main/java/com/google/api/generator/gapic/protoparser/Parser.java
@@ -130,7 +130,12 @@ public static List<Service> parseServices(
               fileToGenerate);
 
       services.addAll(
-          parseService(fileDescriptor, messageTypes, resourceNames, outputArgResourceNames));
+          parseService(
+              fileDescriptor,
+              messageTypes,
+              resourceNames,
+              serviceYamlProtoOpt,
+              outputArgResourceNames));
     }
 
     return services;
@@ -140,28 +145,37 @@ public static List<Service> parseService(
       FileDescriptor fileDescriptor,
       Map<String, Message> messageTypes,
       Map<String, ResourceName> resourceNames,
+      Optional<com.google.api.Service> serviceYamlProtoOpt,
       Set<ResourceName> outputArgResourceNames) {
     String pakkage = TypeParser.getPackage(fileDescriptor);
 
     return fileDescriptor.getServices().stream()
         .map(
             s -> {
-              // TODO(miraleung, v2): Handle missing default_host and oauth_scopes annotations.
+              // Workaround for a missing default_host and oauth_scopes annotation from a service
+              // definition. This can happen for protos that bypass the publishing process.
+              // TODO(miraleung): Remove this workaround later?
               ServiceOptions serviceOptions = s.getOptions();
-              // The proto publishing process will insert these two fields from the 1P esrvice
-              // config YAML file, so we can assume they must be present for v1 for the
-              // microgenerator.
-              Preconditions.checkState(
-                  serviceOptions.hasExtension(ClientProto.defaultHost),
-                  String.format("Default host annotation not found in service %s", s.getName()));
+              String defaultHost = null;
+              if (serviceOptions.hasExtension(ClientProto.defaultHost)) {
+                defaultHost =
+                    sanitizeDefaultHost(serviceOptions.getExtension(ClientProto.defaultHost));
+              } else if (serviceYamlProtoOpt.isPresent()) {
+                // Fall back to the DNS name supplied in the service .yaml config.
+                defaultHost = serviceYamlProtoOpt.get().getName();
+              }
               Preconditions.checkState(
-                  serviceOptions.hasExtension(ClientProto.oauthScopes),
-                  String.format("Oauth scopes annotation not found in service %s", s.getName()));
-
-              String defaultHost =
-                  sanitizeDefaultHost(serviceOptions.getExtension(ClientProto.defaultHost));
-              List<String> oauthScopes =
-                  Arrays.asList(serviceOptions.getExtension(ClientProto.oauthScopes).split(COMMA));
+                  !Strings.isNullOrEmpty(defaultHost),
+                  String.format(
+                      "Default host not found in service YAML config file or annotation for %s",
+                      s.getName()));
+
+              List<String> oauthScopes = Collections.emptyList();
+              if (serviceOptions.hasExtension(ClientProto.oauthScopes)) {
+                oauthScopes =
+                    Arrays.asList(
+                        serviceOptions.getExtension(ClientProto.oauthScopes).split(COMMA));
+              }
 
               Service.Builder serviceBuilder = Service.builder();
               if (fileDescriptor.toProto().hasSourceCodeInfo()) {
diff --git a/src/test/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposerTest.java
index 8802489354..e2d366370e 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposerTest.java
@@ -74,7 +74,11 @@ public void batchingDescriptor_hasSubresponseField() {
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
         Parser.parseService(
-            serviceFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+            serviceFileDescriptor,
+            messageTypes,
+            resourceNames,
+            Optional.empty(),
+            outputResourceNames);
 
     String filename = "pubsub_gapic.yaml";
     Path path = Paths.get(ComposerConstants.TESTFILES_DIRECTORY, filename);
@@ -132,7 +136,11 @@ public void batchingDescriptor_noSubresponseField() {
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
         Parser.parseService(
-            serviceFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+            serviceFileDescriptor,
+            messageTypes,
+            resourceNames,
+            Optional.empty(),
+            outputResourceNames);
 
     String filename = "logging_gapic.yaml";
     Path path = Paths.get(ComposerConstants.TESTFILES_DIRECTORY, filename);
diff --git a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java
index 4437b3a166..bc1f8d0c09 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java
@@ -32,6 +32,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
@@ -53,7 +54,8 @@ public void generateServiceClasses() {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(echoFileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(echoFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
 
     Service echoProtoService = services.get(0);
     GapicClass clazz =
diff --git a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java
index 28f7bec18f..47c7767d45 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposerTest.java
@@ -36,6 +36,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import org.junit.Test;
 
@@ -50,7 +51,8 @@ public void generateGrpcServiceStubClass_simple() {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(echoFileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(echoFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
     Service echoProtoService = services.get(0);
     GapicClass clazz =
         GrpcServiceStubClassComposer.instance().generate(echoProtoService, messageTypes);
@@ -73,7 +75,11 @@ public void generateGrpcServiceStubClass_httpBindings() {
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
         Parser.parseService(
-            testingFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+            testingFileDescriptor,
+            messageTypes,
+            resourceNames,
+            Optional.empty(),
+            outputResourceNames);
     Service testingProtoService = services.get(0);
     GapicClass clazz =
         GrpcServiceStubClassComposer.instance().generate(testingProtoService, messageTypes);
@@ -102,7 +108,11 @@ public void generateGrpcServiceStubClass_httpBindingsWithSubMessageFields() {
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
         Parser.parseService(
-            serviceFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+            serviceFileDescriptor,
+            messageTypes,
+            resourceNames,
+            Optional.empty(),
+            outputResourceNames);
 
     Service service = services.get(0);
     GapicClass clazz = GrpcServiceStubClassComposer.instance().generate(service, messageTypes);
diff --git a/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java
index aa4e19b271..61785acb7b 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java
@@ -32,6 +32,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
@@ -53,7 +54,8 @@ public void generateServiceClasses() {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(echoFileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(echoFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
 
     Service echoProtoService = services.get(0);
     GapicClass clazz = MockServiceClassComposer.instance().generate(echoProtoService, messageTypes);
diff --git a/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java
index 6e0295adb2..624126bb96 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java
@@ -32,6 +32,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
@@ -53,7 +54,8 @@ public void generateServiceClasses() {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(echoFileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(echoFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
 
     Service echoProtoService = services.get(0);
     GapicClass clazz =
diff --git a/src/test/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposerTest.java
index 39b76b2d85..cf29462c31 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposerTest.java
@@ -35,6 +35,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -88,7 +89,8 @@ public void generateResourceNameClass_echoFoobarMultiplePatterns() {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(echoFileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(echoFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
 
     ResourceName foobarResname = resourceNames.get("showcase.googleapis.com/Foobar");
     assertThat(outputResourceNames).contains(foobarResname);
@@ -114,7 +116,11 @@ public void generateResourceNameClass_testingSessionOnePattern() {
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
         Parser.parseService(
-            testingFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+            testingFileDescriptor,
+            messageTypes,
+            resourceNames,
+            Optional.empty(),
+            outputResourceNames);
 
     ResourceName sessionResname = resourceNames.get("showcase.googleapis.com/Session");
     assertThat(outputResourceNames).contains(sessionResname);
diff --git a/src/test/java/com/google/api/generator/gapic/composer/RetrySettingsComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/RetrySettingsComposerTest.java
index be764f7073..a0f74f2052 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/RetrySettingsComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/RetrySettingsComposerTest.java
@@ -81,7 +81,8 @@ public void paramDefinitionsBlock_noConfigsFound() {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(echoFileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(echoFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
     assertEquals(1, services.size());
 
     Service service = services.get(0);
@@ -118,7 +119,8 @@ public void paramDefinitionsBlock_basic() {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(echoFileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(echoFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
     assertEquals(1, services.size());
 
     Service service = services.get(0);
@@ -159,7 +161,8 @@ public void codesDefinitionsBlock_noConfigsFound() {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(echoFileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(echoFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
     assertEquals(1, services.size());
 
     Service service = services.get(0);
@@ -196,7 +199,8 @@ public void codesDefinitionsBlock_basic() {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(echoFileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(echoFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
     assertEquals(1, services.size());
 
     Service service = services.get(0);
@@ -236,7 +240,8 @@ public void simpleBuilderExpr_basic() {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(echoFileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(echoFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
     assertEquals(1, services.size());
 
     Service service = services.get(0);
@@ -318,7 +323,8 @@ public void lroBuilderExpr() {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(echoFileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(echoFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
     assertEquals(1, services.size());
 
     Service service = services.get(0);
@@ -379,7 +385,11 @@ public void batchingSettings_minimalFlowControlSettings() {
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
         Parser.parseService(
-            serviceFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+            serviceFileDescriptor,
+            messageTypes,
+            resourceNames,
+            Optional.empty(),
+            outputResourceNames);
 
     String filename = "pubsub_gapic.yaml";
     Path path = Paths.get(ComposerConstants.TESTFILES_DIRECTORY, filename);
@@ -456,7 +466,11 @@ public void batchingSettings_fullFlowControlSettings() {
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
         Parser.parseService(
-            serviceFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+            serviceFileDescriptor,
+            messageTypes,
+            resourceNames,
+            Optional.empty(),
+            outputResourceNames);
 
     String filename = "logging_gapic.yaml";
     Path path = Paths.get(ComposerConstants.TESTFILES_DIRECTORY, filename);
diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java
index 7e2f8d24d0..1a882a6a30 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientClassComposerTest.java
@@ -33,6 +33,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import org.junit.Test;
 
@@ -47,7 +48,8 @@ public void generateServiceClasses() {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(echoFileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(echoFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
 
     Service echoProtoService = services.get(0);
     GapicClass clazz =
@@ -70,7 +72,8 @@ public void generateServiceClasses_methodSignatureHasNestedFields() {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(fileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(fileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            fileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
 
     Service protoService = services.get(0);
     GapicClass clazz = ServiceClientClassComposer.instance().generate(protoService, messageTypes);
diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java
index 7a4c45c510..358b830b5e 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java
@@ -40,6 +40,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import org.junit.Test;
 
@@ -54,7 +55,8 @@ public void generateClientTest_echoClient() {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(echoFileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(echoFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
 
     Service echoProtoService = services.get(0);
     GapicClass clazz =
@@ -85,7 +87,11 @@ public void generateClientTest_pubSubPublisherClient() {
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
         Parser.parseService(
-            serviceFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+            serviceFileDescriptor,
+            messageTypes,
+            resourceNames,
+            Optional.empty(),
+            outputResourceNames);
 
     Service subscriptionService = services.get(1);
     assertEquals("Subscriber", subscriptionService.name());
@@ -128,7 +134,11 @@ public void generateClientTest_logging() {
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
         Parser.parseService(
-            serviceFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+            serviceFileDescriptor,
+            messageTypes,
+            resourceNames,
+            Optional.empty(),
+            outputResourceNames);
 
     Service loggingService = services.get(0);
     GapicClass clazz =
diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java
index 17aa47ed38..bd7b41eb16 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceSettingsClassComposerTest.java
@@ -32,6 +32,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
@@ -53,7 +54,8 @@ public void generateServiceClasses() {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(echoFileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(echoFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
 
     Service echoProtoService = services.get(0);
     GapicClass clazz =
diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java
index 87417b7c6e..2e7a390b0b 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubClassComposerTest.java
@@ -32,6 +32,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
@@ -53,7 +54,8 @@ public void generateServiceClasses() {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(echoFileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(echoFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            echoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
 
     Service echoProtoService = services.get(0);
     GapicClass clazz = ServiceStubClassComposer.instance().generate(echoProtoService, messageTypes);
diff --git a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposerTest.java b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposerTest.java
index 21048a3189..527e513101 100644
--- a/src/test/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposerTest.java
+++ b/src/test/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposerTest.java
@@ -182,6 +182,6 @@ private static List<Service> parseServices(
       Map<String, ResourceName> resourceNames) {
     Set<ResourceName> outputResourceNames = new HashSet<>();
     return Parser.parseService(
-        protoFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        protoFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
   }
 }
diff --git a/src/test/java/com/google/api/generator/gapic/model/GapicServiceConfigTest.java b/src/test/java/com/google/api/generator/gapic/model/GapicServiceConfigTest.java
index 7d1ba5c9d5..43564350d5 100644
--- a/src/test/java/com/google/api/generator/gapic/model/GapicServiceConfigTest.java
+++ b/src/test/java/com/google/api/generator/gapic/model/GapicServiceConfigTest.java
@@ -209,7 +209,8 @@ private static Service parseService(FileDescriptor fileDescriptor) {
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(fileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
     List<Service> services =
-        Parser.parseService(fileDescriptor, messageTypes, resourceNames, outputResourceNames);
+        Parser.parseService(
+            fileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
     assertEquals(1, services.size());
 
     return services.get(0);
diff --git a/src/test/java/com/google/api/generator/gapic/protoparser/ParserTest.java b/src/test/java/com/google/api/generator/gapic/protoparser/ParserTest.java
index 5668d86445..d092b7111b 100644
--- a/src/test/java/com/google/api/generator/gapic/protoparser/ParserTest.java
+++ b/src/test/java/com/google/api/generator/gapic/protoparser/ParserTest.java
@@ -41,6 +41,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
@@ -371,7 +372,8 @@ public void parseResourceNames_inputTypeHasReferenceNotInMethodSignature() {
     Map<String, Message> messageTypes = Parser.parseMessages(testingFileDescriptor);
     Map<String, ResourceName> resourceNames = Parser.parseResourceNames(testingFileDescriptor);
     Set<ResourceName> outputResourceNames = new HashSet<>();
-    Parser.parseService(testingFileDescriptor, messageTypes, resourceNames, outputResourceNames);
+    Parser.parseService(
+        testingFileDescriptor, messageTypes, resourceNames, Optional.empty(), outputResourceNames);
 
     assertEquals(2, outputResourceNames.size());
 
diff --git a/test/integration/BUILD.bazel b/test/integration/BUILD.bazel
index f778566ed1..6335236d89 100644
--- a/test/integration/BUILD.bazel
+++ b/test/integration/BUILD.bazel
@@ -5,6 +5,7 @@ load(
 )
 load(
     "//:rules_bazel/java/integration_test.bzl",
+    "golden_update",
     "integration_test",
     "golden_update",
 )
@@ -23,8 +24,27 @@ integration_test(
 
 integration_test(
     name = "asset",
+    data = ["//test/integration/goldens/asset:goldens_files"],
     target = ":asset_java_gapic",
+)
+
+golden_update(
+    name = "redis_update",
+    data = ["//test/integration/goldens/redis:goldens_files"],
+    target = ":redis_java_gapic",
+)
+
+golden_update(
+    name = "asset_update",
+    data = ["//test/integration/goldens/asset:goldens_files"],
+    target = ":asset_java_gapic",
+)
+
+golden_update(
+    name = "asset_update",
+    data = ["//test/integration/goldens/asset:goldens_files"],
     data = ["//test/integration/goldens/asset:goldens_files"],
+    target = ":asset_java_gapic",
 )
 
 golden_update(
@@ -100,4 +120,3 @@ java_gapic_library(
         "@com_google_googleapis//google/logging/v2:logging_java_proto",
     ],
 )
-