diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java
index 08f309435aba..831a65f88e38 100644
--- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java
+++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java
@@ -21,6 +21,7 @@
 
 import com.google.api.MonitoredResourceDescriptor;
 import com.google.api.gax.batching.BatchingSettings;
+import com.google.api.gax.batching.PartitionKey;
 import com.google.api.gax.batching.RequestBuilder;
 import com.google.api.gax.core.FlowControlSettings;
 import com.google.api.gax.core.FlowController.LimitExceededBehavior;
@@ -399,13 +400,9 @@ public ListLogsPagedResponse createPagedListResponse(
       WRITE_LOG_ENTRIES_BATCHING_DESC =
           new BatchingDescriptor<WriteLogEntriesRequest, WriteLogEntriesResponse>() {
             @Override
-            public String getBatchPartitionKey(WriteLogEntriesRequest request) {
-              return request.getLogName()
-                  + "|"
-                  + request.getResource()
-                  + "|"
-                  + request.getLabels()
-                  + "|";
+            public PartitionKey getBatchPartitionKey(WriteLogEntriesRequest request) {
+              return new PartitionKey(
+                  request.getLogName(), request.getResource(), request.getLabels());
             }
 
             @Override
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java
index 1f4b9cdbf81a..3d351be03466 100644
--- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java
+++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java
@@ -19,6 +19,7 @@
 import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListTopicsPagedResponse;
 
 import com.google.api.gax.batching.BatchingSettings;
+import com.google.api.gax.batching.PartitionKey;
 import com.google.api.gax.batching.RequestBuilder;
 import com.google.api.gax.core.FlowControlSettings;
 import com.google.api.gax.core.FlowController.LimitExceededBehavior;
@@ -371,8 +372,8 @@ public ListTopicSubscriptionsPagedResponse createPagedListResponse(
   private static final BatchingDescriptor<PublishRequest, PublishResponse> PUBLISH_BATCHING_DESC =
       new BatchingDescriptor<PublishRequest, PublishResponse>() {
         @Override
-        public String getBatchPartitionKey(PublishRequest request) {
-          return request.getTopic() + "|";
+        public PartitionKey getBatchPartitionKey(PublishRequest request) {
+          return new PartitionKey(request.getTopic());
         }
 
         @Override
diff --git a/pom.xml b/pom.xml
index 38367b16d974..c433a4afafca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
     <github.global.server>github</github.global.server>
     <google.auth.version>0.6.0</google.auth.version>
     <grpc.version>1.0.3</grpc.version>
-    <gax.version>0.7.0</gax.version>
+    <gax.version>0.8.0</gax.version>
     <generatedProto.version>0.1.5</generatedProto.version>
     <core.version>0.10.1-alpha-SNAPSHOT</core.version>
     <beta.version>0.10.1-beta-SNAPSHOT</beta.version>