diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index 169b17b..3f15131 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -4043,7 +4043,7 @@
   }
   if (sent_packet_manager_.handshake_confirmed()) {
     // A forward secure packet has been received.
-    QUIC_BUG_IF(encryption_level_ != ENCRYPTION_FORWARD_SECURE);
+    // QUIC_BUG_IF(encryption_level_ != ENCRYPTION_FORWARD_SECURE);
     return ENCRYPTION_FORWARD_SECURE;
   }
   if (framer_.HasEncrypterOfEncryptionLevel(ENCRYPTION_ZERO_RTT)) {
diff --git a/quic/core/quic_packet_generator.cc b/quic/core/quic_packet_generator.cc
index 766f8ca..f98c31b 100644
--- a/quic/core/quic_packet_generator.cc
+++ b/quic/core/quic_packet_generator.cc
@@ -540,6 +540,9 @@
                                      "generator tries to send ACK frame.";
   for (const auto& frame : frames) {
     DCHECK(frame.type == ACK_FRAME || frame.type == STOP_WAITING_FRAME);
+    if (frame.type == ACK_FRAME && frame.ack_frame->packets.Empty()) {
+      continue;
+    }
     if (packet_creator_.HasPendingFrames()) {
       if (packet_creator_.AddSavedFrame(frame, next_transmission_type_)) {
         // There is pending frames and current frame fits.
diff --git a/quic/core/quic_versions.cc b/quic/core/quic_versions.cc
index ed493a5..45bccc9 100644
--- a/quic/core/quic_versions.cc
+++ b/quic/core/quic_versions.cc
@@ -436,6 +436,7 @@
   SetQuicReloadableFlag(quic_print_tag_hex, true);
   SetQuicReloadableFlag(quic_send_version_negotiation_fixed_bit, true);
   SetQuicReloadableFlag(quic_no_client_conn_ver_negotiation, true);
+  SetQuicReloadableFlag(quic_eliminate_static_stream_map_3, true);
   SetQuicRestartFlag(quic_no_server_conn_ver_negotiation2, true);
   SetQuicRestartFlag(quic_server_drop_version_negotiation, true);
   SetQuicRestartFlag(quic_enable_accept_random_ipn, true);