diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java
index 1dfb4e611d..ae23a0aedd 100644
--- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java
+++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java
@@ -65,13 +65,11 @@
 import com.google.api.generator.engine.ast.PrimitiveValue;
 import com.google.api.generator.engine.ast.Reference;
 import com.google.api.generator.engine.ast.ReferenceConstructorExpr;
-import com.google.api.generator.engine.ast.RelationalOperationExpr;
 import com.google.api.generator.engine.ast.ReturnExpr;
 import com.google.api.generator.engine.ast.ScopeNode;
 import com.google.api.generator.engine.ast.Statement;
 import com.google.api.generator.engine.ast.StringObjectValue;
 import com.google.api.generator.engine.ast.SuperObjectValue;
-import com.google.api.generator.engine.ast.TernaryExpr;
 import com.google.api.generator.engine.ast.ThisObjectValue;
 import com.google.api.generator.engine.ast.ThrowExpr;
 import com.google.api.generator.engine.ast.TypeNode;
@@ -788,27 +786,9 @@ private static Expr createPagedListDescriptorAssignExpr(
                 .setGenerics(Arrays.asList(repeatedResponseType.reference()))
                 .build());
 
-    Expr getResponsesExpr;
-    Expr elseExpr;
-    Expr thenExpr;
     if (repeatedResponseType.reference() != null
         && "java.util.Map.Entry".equals(repeatedResponseType.reference().fullName())) {
-      getResponsesExpr =
-          MethodInvocationExpr.builder()
-              .setExprReferenceExpr(payloadVarExpr)
-              .setMethodName(
-                  String.format("get%sMap", JavaStyle.toUpperCamelCase(repeatedFieldName)))
-              .setReturnType(returnType)
-              .build();
-      thenExpr =
-          MethodInvocationExpr.builder()
-              .setStaticReferenceType(
-                  TypeNode.withReference(ConcreteReference.withClazz(Collections.class)))
-              .setGenerics(Arrays.asList(repeatedResponseType.reference()))
-              .setMethodName("emptySet")
-              .setReturnType(returnType)
-              .build();
-      elseExpr =
+      returnExpr =
           MethodInvocationExpr.builder()
               .setMethodName("entrySet")
               .setExprReferenceExpr(
@@ -820,39 +800,14 @@ private static Expr createPagedListDescriptorAssignExpr(
               .setReturnType(returnType)
               .build();
     } else {
-      getResponsesExpr =
+      returnExpr =
           MethodInvocationExpr.builder()
               .setExprReferenceExpr(payloadVarExpr)
               .setMethodName(
                   String.format("get%sList", JavaStyle.toUpperCamelCase(repeatedFieldName)))
               .setReturnType(returnType)
               .build();
-      thenExpr =
-          MethodInvocationExpr.builder()
-              .setStaticReferenceType(
-                  TypeNode.withReference(ConcreteReference.withClazz(ImmutableList.class)))
-              .setGenerics(Arrays.asList(repeatedResponseType.reference()))
-              .setMethodName("of")
-              .setReturnType(returnType)
-              .build();
-      elseExpr = getResponsesExpr;
     }
-    // While protobufs should not be null, this null-check is needed to protect against NPEs
-    // in paged iteration on clients that use legacy HTTP/JSON types, as these clients can
-    // actually return null instead of an empty list.
-    // Context:
-    //   Original issue: https://github.com/googleapis/google-cloud-java/issues/3736
-    //   Relevant discussion where this check was first added:
-    //        https://github.com/googleapis/google-cloud-java/pull/4499#discussion_r257057409
-    Expr conditionExpr =
-        RelationalOperationExpr.equalToWithExprs(getResponsesExpr, ValueExpr.createNullExpr());
-
-    returnExpr =
-        TernaryExpr.builder()
-            .setConditionExpr(conditionExpr)
-            .setThenExpr(thenExpr)
-            .setElseExpr(elseExpr)
-            .build();
     anonClassMethods.add(
         methodStarterBuilder
             .setReturnType(returnType)
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden
index 5e89e0e847..70a3e622dc 100644
--- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden
+++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden
@@ -180,9 +180,7 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {
 
             @Override
             public Iterable<EchoResponse> extractResources(PagedExpandResponse payload) {
-              return payload.getResponsesList() == null
-                  ? ImmutableList.<EchoResponse>of()
-                  : payload.getResponsesList();
+              return payload.getResponsesList();
             }
           };
 
@@ -216,9 +214,7 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {
 
             @Override
             public Iterable<EchoResponse> extractResources(PagedExpandResponse payload) {
-              return payload.getResponsesList() == null
-                  ? ImmutableList.<EchoResponse>of()
-                  : payload.getResponsesList();
+              return payload.getResponsesList();
             }
           };
 
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingServiceV2StubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingServiceV2StubSettings.golden
index 84bac1bf7c..3b10c57af5 100644
--- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingServiceV2StubSettings.golden
+++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingServiceV2StubSettings.golden
@@ -168,9 +168,7 @@ public class LoggingServiceV2StubSettings extends StubSettings<LoggingServiceV2S
 
             @Override
             public Iterable<LogEntry> extractResources(ListLogEntriesResponse payload) {
-              return payload.getEntriesList() == null
-                  ? ImmutableList.<LogEntry>of()
-                  : payload.getEntriesList();
+              return payload.getEntriesList();
             }
           };
 
@@ -217,9 +215,7 @@ public class LoggingServiceV2StubSettings extends StubSettings<LoggingServiceV2S
             @Override
             public Iterable<MonitoredResourceDescriptor> extractResources(
                 ListMonitoredResourceDescriptorsResponse payload) {
-              return payload.getResourceDescriptorsList() == null
-                  ? ImmutableList.<MonitoredResourceDescriptor>of()
-                  : payload.getResourceDescriptorsList();
+              return payload.getResourceDescriptorsList();
             }
           };
 
@@ -253,9 +249,7 @@ public class LoggingServiceV2StubSettings extends StubSettings<LoggingServiceV2S
 
             @Override
             public Iterable<String> extractResources(ListLogsResponse payload) {
-              return payload.getLogNamesList() == null
-                  ? ImmutableList.<String>of()
-                  : payload.getLogNamesList();
+              return payload.getLogNamesList();
             }
           };
 
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/PublisherStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/PublisherStubSettings.golden
index cac396a5b0..e2cb59fee4 100644
--- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/PublisherStubSettings.golden
+++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/PublisherStubSettings.golden
@@ -166,9 +166,7 @@ public class PublisherStubSettings extends StubSettings<PublisherStubSettings> {
 
             @Override
             public Iterable<Topic> extractResources(ListTopicsResponse payload) {
-              return payload.getTopicsList() == null
-                  ? ImmutableList.<Topic>of()
-                  : payload.getTopicsList();
+              return payload.getTopicsList();
             }
           };
 
@@ -208,9 +206,7 @@ public class PublisherStubSettings extends StubSettings<PublisherStubSettings> {
 
             @Override
             public Iterable<String> extractResources(ListTopicSubscriptionsResponse payload) {
-              return payload.getSubscriptionsList() == null
-                  ? ImmutableList.<String>of()
-                  : payload.getSubscriptionsList();
+              return payload.getSubscriptionsList();
             }
           };
 
@@ -247,9 +243,7 @@ public class PublisherStubSettings extends StubSettings<PublisherStubSettings> {
 
             @Override
             public Iterable<String> extractResources(ListTopicSnapshotsResponse payload) {
-              return payload.getSnapshotsList() == null
-                  ? ImmutableList.<String>of()
-                  : payload.getSnapshotsList();
+              return payload.getSnapshotsList();
             }
           };
 
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden
index a4ea58d8fc..41cfa15e00 100644
--- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden
+++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden
@@ -186,9 +186,7 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {
 
             @Override
             public Iterable<EchoResponse> extractResources(PagedExpandResponse payload) {
-              return payload.getResponsesList() == null
-                  ? ImmutableList.<EchoResponse>of()
-                  : payload.getResponsesList();
+              return payload.getResponsesList();
             }
           };
 
@@ -222,9 +220,7 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {
 
             @Override
             public Iterable<EchoResponse> extractResources(PagedExpandResponse payload) {
-              return payload.getResponsesList() == null
-                  ? ImmutableList.<EchoResponse>of()
-                  : payload.getResponsesList();
+              return payload.getResponsesList();
             }
           };
 
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/ComplianceStubSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/ComplianceStubSettings.java
index 84c9022041..38216b5348 100644
--- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/ComplianceStubSettings.java
+++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/ComplianceStubSettings.java
@@ -171,9 +171,7 @@ public String extractNextToken(ListLocationsResponse payload) {
 
             @Override
             public Iterable<Location> extractResources(ListLocationsResponse payload) {
-              return payload.getLocationsList() == null
-                  ? ImmutableList.<Location>of()
-                  : payload.getLocationsList();
+              return payload.getLocationsList();
             }
           };
 
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStubSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStubSettings.java
index fdfaf8c556..c339fa1e7e 100644
--- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStubSettings.java
+++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStubSettings.java
@@ -82,7 +82,6 @@
 import com.google.showcase.v1beta1.WaitRequest;
 import com.google.showcase.v1beta1.WaitResponse;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Generated;
@@ -225,9 +224,7 @@ public String extractNextToken(PagedExpandResponse payload) {
 
             @Override
             public Iterable<EchoResponse> extractResources(PagedExpandResponse payload) {
-              return payload.getResponsesList() == null
-                  ? ImmutableList.<EchoResponse>of()
-                  : payload.getResponsesList();
+              return payload.getResponsesList();
             }
           };
 
@@ -268,9 +265,7 @@ public String extractNextToken(PagedExpandLegacyMappedResponse payload) {
             @Override
             public Iterable<Map.Entry<String, PagedExpandResponseList>> extractResources(
                 PagedExpandLegacyMappedResponse payload) {
-              return payload.getAlphabetizedMap() == null
-                  ? Collections.<Map.Entry<String, PagedExpandResponseList>>emptySet()
-                  : payload.getAlphabetizedMap().entrySet();
+              return payload.getAlphabetizedMap().entrySet();
             }
           };
 
@@ -304,9 +299,7 @@ public String extractNextToken(ListLocationsResponse payload) {
 
             @Override
             public Iterable<Location> extractResources(ListLocationsResponse payload) {
-              return payload.getLocationsList() == null
-                  ? ImmutableList.<Location>of()
-                  : payload.getLocationsList();
+              return payload.getLocationsList();
             }
           };
 
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/IdentityStubSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/IdentityStubSettings.java
index ab34bcff79..4864dde0cc 100644
--- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/IdentityStubSettings.java
+++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/IdentityStubSettings.java
@@ -172,9 +172,7 @@ public String extractNextToken(ListUsersResponse payload) {
 
             @Override
             public Iterable<User> extractResources(ListUsersResponse payload) {
-              return payload.getUsersList() == null
-                  ? ImmutableList.<User>of()
-                  : payload.getUsersList();
+              return payload.getUsersList();
             }
           };
 
@@ -208,9 +206,7 @@ public String extractNextToken(ListLocationsResponse payload) {
 
             @Override
             public Iterable<Location> extractResources(ListLocationsResponse payload) {
-              return payload.getLocationsList() == null
-                  ? ImmutableList.<Location>of()
-                  : payload.getLocationsList();
+              return payload.getLocationsList();
             }
           };
 
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStubSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStubSettings.java
index 9a1b0726ea..81e07af7c0 100644
--- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStubSettings.java
+++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStubSettings.java
@@ -233,9 +233,7 @@ public String extractNextToken(ListRoomsResponse payload) {
 
             @Override
             public Iterable<Room> extractResources(ListRoomsResponse payload) {
-              return payload.getRoomsList() == null
-                  ? ImmutableList.<Room>of()
-                  : payload.getRoomsList();
+              return payload.getRoomsList();
             }
           };
 
@@ -269,9 +267,7 @@ public String extractNextToken(ListBlurbsResponse payload) {
 
             @Override
             public Iterable<Blurb> extractResources(ListBlurbsResponse payload) {
-              return payload.getBlurbsList() == null
-                  ? ImmutableList.<Blurb>of()
-                  : payload.getBlurbsList();
+              return payload.getBlurbsList();
             }
           };
 
@@ -305,9 +301,7 @@ public String extractNextToken(ListLocationsResponse payload) {
 
             @Override
             public Iterable<Location> extractResources(ListLocationsResponse payload) {
-              return payload.getLocationsList() == null
-                  ? ImmutableList.<Location>of()
-                  : payload.getLocationsList();
+              return payload.getLocationsList();
             }
           };
 
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/SequenceServiceStubSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/SequenceServiceStubSettings.java
index 177617108d..58d3b6bb75 100644
--- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/SequenceServiceStubSettings.java
+++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/SequenceServiceStubSettings.java
@@ -182,9 +182,7 @@ public String extractNextToken(ListLocationsResponse payload) {
 
             @Override
             public Iterable<Location> extractResources(ListLocationsResponse payload) {
-              return payload.getLocationsList() == null
-                  ? ImmutableList.<Location>of()
-                  : payload.getLocationsList();
+              return payload.getLocationsList();
             }
           };
 
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/TestingStubSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/TestingStubSettings.java
index 7a356f3755..6ce979b578 100644
--- a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/TestingStubSettings.java
+++ b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/TestingStubSettings.java
@@ -185,9 +185,7 @@ public String extractNextToken(ListSessionsResponse payload) {
 
             @Override
             public Iterable<Session> extractResources(ListSessionsResponse payload) {
-              return payload.getSessionsList() == null
-                  ? ImmutableList.<Session>of()
-                  : payload.getSessionsList();
+              return payload.getSessionsList();
             }
           };
 
@@ -221,9 +219,7 @@ public String extractNextToken(ListTestsResponse payload) {
 
             @Override
             public Iterable<Test> extractResources(ListTestsResponse payload) {
-              return payload.getTestsList() == null
-                  ? ImmutableList.<Test>of()
-                  : payload.getTestsList();
+              return payload.getTestsList();
             }
           };
 
@@ -257,9 +253,7 @@ public String extractNextToken(ListLocationsResponse payload) {
 
             @Override
             public Iterable<Location> extractResources(ListLocationsResponse payload) {
-              return payload.getLocationsList() == null
-                  ? ImmutableList.<Location>of()
-                  : payload.getLocationsList();
+              return payload.getLocationsList();
             }
           };
 
diff --git a/showcase/gapic-showcase/src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json b/showcase/gapic-showcase/src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json
index 3d3a14c9ba..49b25c916b 100644
--- a/showcase/gapic-showcase/src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json
+++ b/showcase/gapic-showcase/src/main/resources/META-INF/native-image/com.google.showcase.v1beta1/reflect-config.json
@@ -332,6 +332,24 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.api.PythonSettings$ExperimentalFeatures",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
+  {
+    "name": "com.google.api.PythonSettings$ExperimentalFeatures$Builder",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.api.ResourceDescriptor",
     "queryAllDeclaredConstructors": true,
diff --git a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/ConnectionServiceStubSettings.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/ConnectionServiceStubSettings.java
index 706bfab87e..ee81471625 100644
--- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/ConnectionServiceStubSettings.java
+++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/ConnectionServiceStubSettings.java
@@ -150,9 +150,7 @@ public String extractNextToken(ListConnectionsResponse payload) {
 
             @Override
             public Iterable<Connection> extractResources(ListConnectionsResponse payload) {
-              return payload.getConnectionsList() == null
-                  ? ImmutableList.<Connection>of()
-                  : payload.getConnectionsList();
+              return payload.getConnectionsList();
             }
           };
 
diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java
index 270824cebb..b19926469e 100644
--- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java
+++ b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java
@@ -255,9 +255,7 @@ public String extractNextToken(ListAssetsResponse payload) {
 
             @Override
             public Iterable<Asset> extractResources(ListAssetsResponse payload) {
-              return payload.getAssetsList() == null
-                  ? ImmutableList.<Asset>of()
-                  : payload.getAssetsList();
+              return payload.getAssetsList();
             }
           };
 
@@ -296,9 +294,7 @@ public String extractNextToken(SearchAllResourcesResponse payload) {
             @Override
             public Iterable<ResourceSearchResult> extractResources(
                 SearchAllResourcesResponse payload) {
-              return payload.getResultsList() == null
-                  ? ImmutableList.<ResourceSearchResult>of()
-                  : payload.getResultsList();
+              return payload.getResultsList();
             }
           };
 
@@ -337,9 +333,7 @@ public String extractNextToken(SearchAllIamPoliciesResponse payload) {
             @Override
             public Iterable<IamPolicySearchResult> extractResources(
                 SearchAllIamPoliciesResponse payload) {
-              return payload.getResultsList() == null
-                  ? ImmutableList.<IamPolicySearchResult>of()
-                  : payload.getResultsList();
+              return payload.getResultsList();
             }
           };
 
@@ -376,9 +370,7 @@ public String extractNextToken(ListSavedQueriesResponse payload) {
 
             @Override
             public Iterable<SavedQuery> extractResources(ListSavedQueriesResponse payload) {
-              return payload.getSavedQueriesList() == null
-                  ? ImmutableList.<SavedQuery>of()
-                  : payload.getSavedQueriesList();
+              return payload.getSavedQueriesList();
             }
           };
 
diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/AddressesStubSettings.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/AddressesStubSettings.java
index 7fe62b92b1..5f4fed54b8 100644
--- a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/AddressesStubSettings.java
+++ b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/AddressesStubSettings.java
@@ -59,7 +59,6 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Generated;
@@ -201,9 +200,7 @@ public String extractNextToken(AddressAggregatedList payload) {
             @Override
             public Iterable<Map.Entry<String, AddressesScopedList>> extractResources(
                 AddressAggregatedList payload) {
-              return payload.getItemsMap() == null
-                  ? Collections.<Map.Entry<String, AddressesScopedList>>emptySet()
-                  : payload.getItemsMap().entrySet();
+              return payload.getItemsMap().entrySet();
             }
           };
 
@@ -237,9 +234,7 @@ public String extractNextToken(AddressList payload) {
 
             @Override
             public Iterable<Address> extractResources(AddressList payload) {
-              return payload.getItemsList() == null
-                  ? ImmutableList.<Address>of()
-                  : payload.getItemsList();
+              return payload.getItemsList();
             }
           };
 
diff --git a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/stub/KeyManagementServiceStubSettings.java b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/stub/KeyManagementServiceStubSettings.java
index e080f7f43f..f0cffefd9d 100644
--- a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/stub/KeyManagementServiceStubSettings.java
+++ b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/stub/KeyManagementServiceStubSettings.java
@@ -238,9 +238,7 @@ public String extractNextToken(ListKeyRingsResponse payload) {
 
             @Override
             public Iterable<KeyRing> extractResources(ListKeyRingsResponse payload) {
-              return payload.getKeyRingsList() == null
-                  ? ImmutableList.<KeyRing>of()
-                  : payload.getKeyRingsList();
+              return payload.getKeyRingsList();
             }
           };
 
@@ -275,9 +273,7 @@ public String extractNextToken(ListCryptoKeysResponse payload) {
 
             @Override
             public Iterable<CryptoKey> extractResources(ListCryptoKeysResponse payload) {
-              return payload.getCryptoKeysList() == null
-                  ? ImmutableList.<CryptoKey>of()
-                  : payload.getCryptoKeysList();
+              return payload.getCryptoKeysList();
             }
           };
 
@@ -316,9 +312,7 @@ public String extractNextToken(ListCryptoKeyVersionsResponse payload) {
             @Override
             public Iterable<CryptoKeyVersion> extractResources(
                 ListCryptoKeyVersionsResponse payload) {
-              return payload.getCryptoKeyVersionsList() == null
-                  ? ImmutableList.<CryptoKeyVersion>of()
-                  : payload.getCryptoKeyVersionsList();
+              return payload.getCryptoKeyVersionsList();
             }
           };
 
@@ -353,9 +347,7 @@ public String extractNextToken(ListImportJobsResponse payload) {
 
             @Override
             public Iterable<ImportJob> extractResources(ListImportJobsResponse payload) {
-              return payload.getImportJobsList() == null
-                  ? ImmutableList.<ImportJob>of()
-                  : payload.getImportJobsList();
+              return payload.getImportJobsList();
             }
           };
 
@@ -389,9 +381,7 @@ public String extractNextToken(ListLocationsResponse payload) {
 
             @Override
             public Iterable<Location> extractResources(ListLocationsResponse payload) {
-              return payload.getLocationsList() == null
-                  ? ImmutableList.<Location>of()
-                  : payload.getLocationsList();
+              return payload.getLocationsList();
             }
           };
 
diff --git a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/LibraryServiceStubSettings.java b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/LibraryServiceStubSettings.java
index 92ae57c30f..c512124817 100644
--- a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/LibraryServiceStubSettings.java
+++ b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/LibraryServiceStubSettings.java
@@ -171,9 +171,7 @@ public String extractNextToken(ListShelvesResponse payload) {
 
             @Override
             public Iterable<Shelf> extractResources(ListShelvesResponse payload) {
-              return payload.getShelvesList() == null
-                  ? ImmutableList.<Shelf>of()
-                  : payload.getShelvesList();
+              return payload.getShelvesList();
             }
           };
 
@@ -207,9 +205,7 @@ public String extractNextToken(ListBooksResponse payload) {
 
             @Override
             public Iterable<Book> extractResources(ListBooksResponse payload) {
-              return payload.getBooksList() == null
-                  ? ImmutableList.<Book>of()
-                  : payload.getBooksList();
+              return payload.getBooksList();
             }
           };
 
diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java
index fc53cb791e..29d1e0e413 100644
--- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java
+++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java
@@ -249,9 +249,7 @@ public String extractNextToken(ListBucketsResponse payload) {
 
             @Override
             public Iterable<LogBucket> extractResources(ListBucketsResponse payload) {
-              return payload.getBucketsList() == null
-                  ? ImmutableList.<LogBucket>of()
-                  : payload.getBucketsList();
+              return payload.getBucketsList();
             }
           };
 
@@ -285,9 +283,7 @@ public String extractNextToken(ListViewsResponse payload) {
 
             @Override
             public Iterable<LogView> extractResources(ListViewsResponse payload) {
-              return payload.getViewsList() == null
-                  ? ImmutableList.<LogView>of()
-                  : payload.getViewsList();
+              return payload.getViewsList();
             }
           };
 
@@ -321,9 +317,7 @@ public String extractNextToken(ListSinksResponse payload) {
 
             @Override
             public Iterable<LogSink> extractResources(ListSinksResponse payload) {
-              return payload.getSinksList() == null
-                  ? ImmutableList.<LogSink>of()
-                  : payload.getSinksList();
+              return payload.getSinksList();
             }
           };
 
@@ -359,9 +353,7 @@ public String extractNextToken(ListExclusionsResponse payload) {
 
             @Override
             public Iterable<LogExclusion> extractResources(ListExclusionsResponse payload) {
-              return payload.getExclusionsList() == null
-                  ? ImmutableList.<LogExclusion>of()
-                  : payload.getExclusionsList();
+              return payload.getExclusionsList();
             }
           };
 
diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java
index 939099f108..ebeeb21e1c 100644
--- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java
+++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java
@@ -184,9 +184,7 @@ public String extractNextToken(ListLogEntriesResponse payload) {
 
             @Override
             public Iterable<LogEntry> extractResources(ListLogEntriesResponse payload) {
-              return payload.getEntriesList() == null
-                  ? ImmutableList.<LogEntry>of()
-                  : payload.getEntriesList();
+              return payload.getEntriesList();
             }
           };
 
@@ -233,9 +231,7 @@ public String extractNextToken(ListMonitoredResourceDescriptorsResponse payload)
             @Override
             public Iterable<MonitoredResourceDescriptor> extractResources(
                 ListMonitoredResourceDescriptorsResponse payload) {
-              return payload.getResourceDescriptorsList() == null
-                  ? ImmutableList.<MonitoredResourceDescriptor>of()
-                  : payload.getResourceDescriptorsList();
+              return payload.getResourceDescriptorsList();
             }
           };
 
@@ -269,9 +265,7 @@ public String extractNextToken(ListLogsResponse payload) {
 
             @Override
             public Iterable<String> extractResources(ListLogsResponse payload) {
-              return payload.getLogNamesList() == null
-                  ? ImmutableList.<String>of()
-                  : payload.getLogNamesList();
+              return payload.getLogNamesList();
             }
           };
 
diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java
index ac7e1b659a..b7a7599f63 100644
--- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java
+++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java
@@ -158,9 +158,7 @@ public String extractNextToken(ListLogMetricsResponse payload) {
 
             @Override
             public Iterable<LogMetric> extractResources(ListLogMetricsResponse payload) {
-              return payload.getMetricsList() == null
-                  ? ImmutableList.<LogMetric>of()
-                  : payload.getMetricsList();
+              return payload.getMetricsList();
             }
           };
 
diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java
index 47585fc221..ebf6004424 100644
--- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java
+++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java
@@ -191,9 +191,7 @@ public String extractNextToken(ListTopicsResponse payload) {
 
             @Override
             public Iterable<Topic> extractResources(ListTopicsResponse payload) {
-              return payload.getTopicsList() == null
-                  ? ImmutableList.<Topic>of()
-                  : payload.getTopicsList();
+              return payload.getTopicsList();
             }
           };
 
@@ -233,9 +231,7 @@ public String extractNextToken(ListTopicSubscriptionsResponse payload) {
 
             @Override
             public Iterable<String> extractResources(ListTopicSubscriptionsResponse payload) {
-              return payload.getSubscriptionsList() == null
-                  ? ImmutableList.<String>of()
-                  : payload.getSubscriptionsList();
+              return payload.getSubscriptionsList();
             }
           };
 
@@ -272,9 +268,7 @@ public String extractNextToken(ListTopicSnapshotsResponse payload) {
 
             @Override
             public Iterable<String> extractResources(ListTopicSnapshotsResponse payload) {
-              return payload.getSnapshotsList() == null
-                  ? ImmutableList.<String>of()
-                  : payload.getSnapshotsList();
+              return payload.getSnapshotsList();
             }
           };
 
diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java
index f65ca14057..3f6b181897 100644
--- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java
+++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java
@@ -179,9 +179,7 @@ public String extractNextToken(ListSchemasResponse payload) {
 
             @Override
             public Iterable<Schema> extractResources(ListSchemasResponse payload) {
-              return payload.getSchemasList() == null
-                  ? ImmutableList.<Schema>of()
-                  : payload.getSchemasList();
+              return payload.getSchemasList();
             }
           };
 
@@ -219,9 +217,7 @@ public String extractNextToken(ListSchemaRevisionsResponse payload) {
 
             @Override
             public Iterable<Schema> extractResources(ListSchemaRevisionsResponse payload) {
-              return payload.getSchemasList() == null
-                  ? ImmutableList.<Schema>of()
-                  : payload.getSchemasList();
+              return payload.getSchemasList();
             }
           };
 
diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java
index 8bcce5d901..856738f345 100644
--- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java
+++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java
@@ -199,9 +199,7 @@ public String extractNextToken(ListSubscriptionsResponse payload) {
 
             @Override
             public Iterable<Subscription> extractResources(ListSubscriptionsResponse payload) {
-              return payload.getSubscriptionsList() == null
-                  ? ImmutableList.<Subscription>of()
-                  : payload.getSubscriptionsList();
+              return payload.getSubscriptionsList();
             }
           };
 
@@ -235,9 +233,7 @@ public String extractNextToken(ListSnapshotsResponse payload) {
 
             @Override
             public Iterable<Snapshot> extractResources(ListSnapshotsResponse payload) {
-              return payload.getSnapshotsList() == null
-                  ? ImmutableList.<Snapshot>of()
-                  : payload.getSnapshotsList();
+              return payload.getSnapshotsList();
             }
           };
 
diff --git a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java
index fde6d515b2..9b4aa80e28 100644
--- a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java
+++ b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java
@@ -217,9 +217,7 @@ public String extractNextToken(ListInstancesResponse payload) {
 
             @Override
             public Iterable<Instance> extractResources(ListInstancesResponse payload) {
-              return payload.getInstancesList() == null
-                  ? ImmutableList.<Instance>of()
-                  : payload.getInstancesList();
+              return payload.getInstancesList();
             }
           };
 
diff --git a/test/integration/goldens/storage/src/com/google/storage/v2/stub/StorageStubSettings.java b/test/integration/goldens/storage/src/com/google/storage/v2/stub/StorageStubSettings.java
index c0d6e8102c..23c352e2de 100644
--- a/test/integration/goldens/storage/src/com/google/storage/v2/stub/StorageStubSettings.java
+++ b/test/integration/goldens/storage/src/com/google/storage/v2/stub/StorageStubSettings.java
@@ -240,9 +240,7 @@ public String extractNextToken(ListBucketsResponse payload) {
 
             @Override
             public Iterable<Bucket> extractResources(ListBucketsResponse payload) {
-              return payload.getBucketsList() == null
-                  ? ImmutableList.<Bucket>of()
-                  : payload.getBucketsList();
+              return payload.getBucketsList();
             }
           };
 
@@ -280,9 +278,7 @@ public String extractNextToken(ListNotificationsResponse payload) {
 
             @Override
             public Iterable<Notification> extractResources(ListNotificationsResponse payload) {
-              return payload.getNotificationsList() == null
-                  ? ImmutableList.<Notification>of()
-                  : payload.getNotificationsList();
+              return payload.getNotificationsList();
             }
           };
 
@@ -316,9 +312,7 @@ public String extractNextToken(ListObjectsResponse payload) {
 
             @Override
             public Iterable<Object> extractResources(ListObjectsResponse payload) {
-              return payload.getObjectsList() == null
-                  ? ImmutableList.<Object>of()
-                  : payload.getObjectsList();
+              return payload.getObjectsList();
             }
           };
 
@@ -353,9 +347,7 @@ public String extractNextToken(ListHmacKeysResponse payload) {
 
             @Override
             public Iterable<HmacKeyMetadata> extractResources(ListHmacKeysResponse payload) {
-              return payload.getHmacKeysList() == null
-                  ? ImmutableList.<HmacKeyMetadata>of()
-                  : payload.getHmacKeysList();
+              return payload.getHmacKeysList();
             }
           };