diff --git a/build_torch_xla_libs.sh b/build_torch_xla_libs.sh
index 9bece927bd82..39f27974414f 100755
--- a/build_torch_xla_libs.sh
+++ b/build_torch_xla_libs.sh
@@ -54,9 +54,10 @@ if [[ ! -z "$BAZEL_JOBS" ]]; then
   MAX_JOBS="--jobs=$BAZEL_JOBS"
 fi
 
-OPTS+=(--cxxopt="-std=c++14")
+OPTS+=(--cxxopt="-std=c++17")
 if [[ $(basename -- $CC) =~ ^clang ]]; then
   OPTS+=(--cxxopt="-Wno-c++11-narrowing")
+  OPTS+=(--cxxopt="-Wno-c++14-narrowing")
 fi
 
 if [[ "$XLA_CUDA" == "1" ]]; then
diff --git a/setup.py b/setup.py
index 5dd28fe2a2e8..315ef5e1a4bc 100644
--- a/setup.py
+++ b/setup.py
@@ -303,7 +303,7 @@ def make_relative_rpath(path):
 
 
 extra_compile_args = [
-    '-std=c++14',
+    '-std=c++17',
     '-Wno-sign-compare',
     '-Wno-deprecated-declarations',
     '-Wno-return-type',
diff --git a/test/cpp/CMakeLists.txt b/test/cpp/CMakeLists.txt
index f9e974847289..eed0565ba89a 100644
--- a/test/cpp/CMakeLists.txt
+++ b/test/cpp/CMakeLists.txt
@@ -43,6 +43,8 @@ ExternalProject_Add(
   CMAKE_ARGS
     "-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=${PT_CXX_ABI}")
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+
 ExternalProject_Get_Property(googletest SOURCE_DIR)
 
 set(TORCH_XLA_TEST_SOURCES
diff --git a/third_party/tensorflow b/third_party/tensorflow
index fc1c08fabd81..57d35fb585de 160000
--- a/third_party/tensorflow
+++ b/third_party/tensorflow
@@ -1 +1 @@
-Subproject commit fc1c08fabd81cde16dd60d105c576dd4ee974046
+Subproject commit 57d35fb585de65a34cd6871b8ca3a6501183f98a