Merge branch 'release' into github to roll forward to cl/342290621.

cpp/core/internal/base_endpoint_channel.cc

@@ -163,7 +163,12 @@ Exception BaseEndpointChannel::Write(const ByteArray& data) {
   ByteArray encrypted_data;
   const ByteArray* data_to_write = &data;
   {
+    // Holding both mutexes is necessary to prevent the keep alive and payload
+    // threads from writing encrypted messages out of order which causes a
+    // failure to decrypt on the reader side.
     MutexLock crypto_lock(&crypto_mutex_);
+    MutexLock lock(&writer_mutex_);
+
     if (IsEncryptionEnabledLocked()) {
       // If encryption is enabled, encode the message.
       std::unique_ptr<std::string> encrypted =
@@ -172,10 +177,7 @@ Exception BaseEndpointChannel::Write(const ByteArray& data) {
       encrypted_data = ByteArray(std::move(*encrypted));
       data_to_write = &encrypted_data;
     }
-  }
 
-  {
-    MutexLock lock(&writer_mutex_);
     Exception write_exception =
         WriteInt(writer_, static_cast<std::int32_t>(data_to_write->size()));
     if (write_exception.Raised()) {