diff --git a/quic/core/quic_dispatcher.cc b/quic/core/quic_dispatcher.cc
index 9af4bfe..c3261d8 100644
--- a/quic/core/quic_dispatcher.cc
+++ b/quic/core/quic_dispatcher.cc
@@ -536,7 +536,9 @@
       // unblock this conformance testing we have the following workaround that
       // will be removed once the fixed test is deployed.
       // TODO(b/139691956) Remove this workaround once fixed test is deployed.
-      if (packet_info.packet.length() == 12 &&
+      if (!GetQuicReloadableFlag(
+              quic_remove_android_conformance_test_workaround) &&
+          packet_info.packet.length() == 12 &&
           packet_info.packet.data()[0] == 0x0c &&
           packet_info.packet.data()[9] == 0x01 &&
           packet_info.packet.data()[10] == 0x00 &&
diff --git a/quic/core/quic_dispatcher_test.cc b/quic/core/quic_dispatcher_test.cc
index 7e54dd2..d52651a 100644
--- a/quic/core/quic_dispatcher_test.cc
+++ b/quic/core/quic_dispatcher_test.cc
@@ -1165,7 +1165,10 @@
 }
 
 TEST_P(QuicDispatcherTestOneVersion, AndroidConformanceTestOld) {
-  // TODO(b/139691956) Remove this test once the workaround is removed.
+  if (GetQuicReloadableFlag(quic_remove_android_conformance_test_workaround)) {
+    // TODO(b/139691956) Remove this test once the flag is deprecated.
+    return;
+  }
   SavingWriter* saving_writer = new SavingWriter();
   // dispatcher_ takes ownership of saving_writer.
   QuicDispatcherPeer::UseWriter(dispatcher_.get(), saving_writer);