diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle
index ba0d1b05e8bf..9cf8f3ad2517 100644
--- a/runners/google-cloud-dataflow-java/build.gradle
+++ b/runners/google-cloud-dataflow-java/build.gradle
@@ -244,10 +244,10 @@ def createLegacyWorkerValidatesRunnerTest = { Map args ->
 
 def createValidatesRunnerStreamingTest = { boolean enableGbkMultiplexing ->
   def pipelineOptions = legacyPipelineOptions + ['--streaming']
-  if (enableGbkMultiplexing) {
-    pipelineOptions = pipelineOptions + ['--experiments=enable_gbk_state_multiplexing']
-  }
   def name = 'validatesRunnerLegacyWorkerTestStreaming'
+//  if (enableGbkMultiplexing) {
+  pipelineOptions = pipelineOptions + ['--experiments=enable_gbk_state_multiplexing']
+//  }
   if (enableGbkMultiplexing) {
     name = 'validatesRunnerLegacyWorkerTestStreamingGbkMultiplexing'
   }
@@ -493,7 +493,7 @@ task validatesRunnerStreaming {
 
 task validatesRunnerStreamingWithGbkMultiplexing {
   group = "Verification"
-  description "Validates Dataflow runner forcing streaming mode"
+  description "Validates Dataflow runner forcing streaming mode with GBK state multiplexing"
   dependsOn(createValidatesRunnerStreamingTest(/*enableGbkMultiplexing=*/true))
 }
 
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/internal/KeyedWindow.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/internal/KeyedWindow.java
index 06ad80e455c8..0268d50025b1 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/internal/KeyedWindow.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/internal/KeyedWindow.java
@@ -17,7 +17,6 @@
  */
 package org.apache.beam.runners.dataflow.internal;
 
-import com.google.common.base.Preconditions;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -39,6 +38,7 @@
 import org.apache.beam.sdk.transforms.windowing.WindowMappingFn;
 import org.apache.beam.sdk.values.KV;
 import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
+import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.joda.time.Instant;
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/internal/StateMultiplexingGroupByKey.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/internal/StateMultiplexingGroupByKey.java
index 5d97ef77d1e8..41514d5b0cb3 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/internal/StateMultiplexingGroupByKey.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/internal/StateMultiplexingGroupByKey.java
@@ -17,7 +17,6 @@
  */
 package org.apache.beam.runners.dataflow.internal;
 
-import com.google.common.base.Preconditions;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
@@ -48,6 +47,7 @@
 import org.apache.beam.sdk.values.TupleTagList;
 import org.apache.beam.sdk.values.WindowingStrategy;
 import org.apache.beam.vendor.grpc.v1p60p1.com.google.protobuf.ByteString;
+import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Preconditions;
 
 /**
  * A GroupByKey implementation that multiplexes many small user keys over a fixed set of sharding