diff --git a/quiche/quic/core/quic_config.cc b/quiche/quic/core/quic_config.cc
index e60df28..161426d 100644
--- a/quiche/quic/core/quic_config.cc
+++ b/quiche/quic/core/quic_config.cc
@@ -467,12 +467,12 @@
   connection_options_.SetSendValues(connection_options);
 }
 
-void QuicConfig::SetGoogleHandshakeMessageToSend(const std::string& message) {
-  google_handshake_message_to_send_ = message;
+void QuicConfig::SetGoogleHandshakeMessageToSend(std::string message) {
+  google_handshake_message_to_send_ = std::move(message);
 }
 
-absl::optional<std::string> QuicConfig::GetReceivedGoogleHandshakeMessage()
-    const {
+const absl::optional<std::string>&
+QuicConfig::GetReceivedGoogleHandshakeMessage() const {
   return received_google_handshake_message_;
 }
 
@@ -1414,4 +1414,9 @@
   return QUIC_NO_ERROR;
 }
 
+void QuicConfig::ClearGoogleHandshakeMessage() {
+  google_handshake_message_to_send_.reset();
+  received_google_handshake_message_.reset();
+}
+
 }  // namespace quic
diff --git a/quiche/quic/core/quic_config.h b/quiche/quic/core/quic_config.h
index 61fa9eb..241fe84 100644
--- a/quiche/quic/core/quic_config.h
+++ b/quiche/quic/core/quic_config.h
@@ -247,9 +247,9 @@
 
   bool HasReceivedConnectionOptions() const;
 
-  void SetGoogleHandshakeMessageToSend(const std::string& message);
+  void SetGoogleHandshakeMessageToSend(std::string message);
 
-  absl::optional<std::string> GetReceivedGoogleHandshakeMessage() const;
+  const absl::optional<std::string>& GetReceivedGoogleHandshakeMessage() const;
 
   // Sets initial received connection options.  All received connection options
   // will be initialized with these fields. Initial received options may only be
@@ -516,6 +516,9 @@
     return received_custom_transport_parameters_;
   }
 
+  // Called to clear google_handshake_message to send or received.
+  void ClearGoogleHandshakeMessage();
+
  private:
   friend class test::QuicConfigPeer;