diff --git a/tensorflow/compiler/tf2xla/BUILD b/tensorflow/compiler/tf2xla/BUILD
index 2496fbe029df09d4259893cd3c4dcef5b376420b..e9bcbcc6d83d5e89ffc177621a2f20eafcf38c5d 100644
--- a/tensorflow/compiler/tf2xla/BUILD
+++ b/tensorflow/compiler/tf2xla/BUILD
@@ -716,7 +716,6 @@ tf_cc_test(
         "xla_compiler_test.cc",
         "xla_expression_test.cc",
     ],
-    tags = ["no_oss"],
     deps = [
         ":common",
         ":side_effect_util",
diff --git a/tensorflow/compiler/tf2xla/xla_compiler_test.cc b/tensorflow/compiler/tf2xla/xla_compiler_test.cc
index b932a774a06970174ea1f4d3b731382b0b5658fa..f348552050b8b841a5d460b28aa0ceef893a9147 100644
--- a/tensorflow/compiler/tf2xla/xla_compiler_test.cc
+++ b/tensorflow/compiler/tf2xla/xla_compiler_test.cc
@@ -1903,8 +1903,8 @@ TEST_F(XlaCompilerTest, SetDeviceToHostMetadataExactDuplicate) {
   XlaCompiler compiler(DefaultOptions());
 
   const string& key = "comm_key";
-  std::vector<const DataType> types{DT_INT32};
-  std::vector<const TensorShape> shapes{TensorShape({2})};
+  std::vector<DataType> types{DT_INT32};
+  std::vector<TensorShape> shapes{TensorShape({2})};
 
   TF_ASSERT_OK(compiler.SetDeviceToHostMetadata(key, types, shapes));
   TF_ASSERT_OK(compiler.SetDeviceToHostMetadata(key, types, shapes));
@@ -1916,10 +1916,10 @@ TEST_F(XlaCompilerTest, SetDeviceToHostMetadataMismatchedDuplicate) {
   XlaCompiler compiler(DefaultOptions());
 
   const string& key = "comm_key";
-  std::vector<const DataType> types{DT_INT32};
-  std::vector<const TensorShape> shapes{TensorShape({2})};
-  std::vector<const DataType> types2{DT_FLOAT};
-  std::vector<const TensorShape> shapes2{TensorShape({1})};
+  std::vector<DataType> types{DT_INT32};
+  std::vector<TensorShape> shapes{TensorShape({2})};
+  std::vector<DataType> types2{DT_FLOAT};
+  std::vector<TensorShape> shapes2{TensorShape({1})};
 
   TF_ASSERT_OK(compiler.SetDeviceToHostMetadata(key, types, shapes));
   Status status = compiler.SetDeviceToHostMetadata(key, types2, shapes2);
@@ -1932,8 +1932,8 @@ TEST_F(XlaCompilerTest, SetHostToDeviceMetadataExactDuplicate) {
   XlaCompiler compiler(DefaultOptions());
 
   const string& key = "comm_key";
-  std::vector<const DataType> types{DT_INT32};
-  std::vector<const TensorShape> shapes{TensorShape({2})};
+  std::vector<DataType> types{DT_INT32};
+  std::vector<TensorShape> shapes{TensorShape({2})};
 
   TF_ASSERT_OK(compiler.SetHostToDeviceMetadata(key, types, shapes));
   TF_ASSERT_OK(compiler.SetHostToDeviceMetadata(key, types, shapes));
@@ -1945,10 +1945,10 @@ TEST_F(XlaCompilerTest, SetHostToDeviceMetadataMismatchedDuplicate) {
   XlaCompiler compiler(DefaultOptions());
 
   const string& key = "comm_key";
-  std::vector<const DataType> types{DT_INT32};
-  std::vector<const TensorShape> shapes{TensorShape({2})};
-  std::vector<const DataType> types2{DT_FLOAT};
-  std::vector<const TensorShape> shapes2{TensorShape({1})};
+  std::vector<DataType> types{DT_INT32};
+  std::vector<TensorShape> shapes{TensorShape({2})};
+  std::vector<DataType> types2{DT_FLOAT};
+  std::vector<TensorShape> shapes2{TensorShape({1})};
 
   TF_ASSERT_OK(compiler.SetHostToDeviceMetadata(key, types, shapes));
   Status status = compiler.SetHostToDeviceMetadata(key, types2, shapes2);