diff --git a/tensorflow/compiler/xla/python/local_client.cc b/tensorflow/compiler/xla/python/local_client.cc
index b8bef42e925..3cc85ad89d9 100644
--- a/tensorflow/compiler/xla/python/local_client.cc
+++ b/tensorflow/compiler/xla/python/local_client.cc
@@ -776,7 +776,9 @@ PyLocalBuffer::CopyToDeviceHelper(
     return copy_event_or.status();
   }
 
-  return std::pair(std::move(py_buffer), copy_event_or.ConsumeValueOrDie());
+  return std::pair<std::unique_ptr<PyLocalBuffer>,
+                   std::shared_ptr<BufferDefinitionEvent>>(
+      std::move(py_buffer), copy_event_or.ConsumeValueOrDie());
 }
 
 StatusOr<std::unique_ptr<PyLocalBuffer>> PyLocalBuffer::CopyToDevice(