diff --git a/.bazelrc b/.bazelrc
index 7feb49f753fa9db4d1d92ed3abdd088341785924..88c8ea1854f89295625156169439a6f32d517cdb 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -555,6 +555,7 @@ build:release_cpu_linux --crosstool_top="@sigbuild-r2.14-clang_config_cuda//cros
 # offset of in the current version of ubp.
 # See https://github.com/protocolbuffers/upb/blob/9effcbcb27f0a665f9f345030188c0b291e32482/upb/upb.c#L183.
 build:release_cpu_linux --copt=-Wno-gnu-offsetof-extensions
+build:release_cpu_linux --copt=-Wno-error=array-parameter
 # Set lld as the linker.
 build:release_cpu_linux --linkopt="-fuse-ld=lld"
 build:release_cpu_linux --linkopt="-lm"
diff --git a/third_party/xla/.bazelrc b/third_party/xla/.bazelrc
index 7feb49f753fa9db4d1d92ed3abdd088341785924..88c8ea1854f89295625156169439a6f32d517cdb 100644
--- a/third_party/xla/.bazelrc
+++ b/third_party/xla/.bazelrc
@@ -555,6 +555,7 @@ build:release_cpu_linux --crosstool_top="@sigbuild-r2.14-clang_config_cuda//cros
 # offset of in the current version of ubp.
 # See https://github.com/protocolbuffers/upb/blob/9effcbcb27f0a665f9f345030188c0b291e32482/upb/upb.c#L183.
 build:release_cpu_linux --copt=-Wno-gnu-offsetof-extensions
+build:release_cpu_linux --copt=-Wno-error=array-parameter
 # Set lld as the linker.
 build:release_cpu_linux --linkopt="-fuse-ld=lld"
 build:release_cpu_linux --linkopt="-lm"
diff --git a/third_party/xla/third_party/tsl/.bazelrc b/third_party/xla/third_party/tsl/.bazelrc
index 7feb49f753fa9db4d1d92ed3abdd088341785924..88c8ea1854f89295625156169439a6f32d517cdb 100644
--- a/third_party/xla/third_party/tsl/.bazelrc
+++ b/third_party/xla/third_party/tsl/.bazelrc
@@ -555,6 +555,7 @@ build:release_cpu_linux --crosstool_top="@sigbuild-r2.14-clang_config_cuda//cros
 # offset of in the current version of ubp.
 # See https://github.com/protocolbuffers/upb/blob/9effcbcb27f0a665f9f345030188c0b291e32482/upb/upb.c#L183.
 build:release_cpu_linux --copt=-Wno-gnu-offsetof-extensions
+build:release_cpu_linux --copt=-Wno-error=array-parameter
 # Set lld as the linker.
 build:release_cpu_linux --linkopt="-fuse-ld=lld"
 build:release_cpu_linux --linkopt="-lm"
diff --git a/third_party/xla/third_party/tsl/.kokoro/linux/build.sh b/third_party/xla/third_party/tsl/.kokoro/linux/build.sh
index b25f0d26126d49995365e2f2f734ffa923242d58..f05e02bfc6cc7b27df25dde4f94d4ef8c33cb63f 100644
--- a/third_party/xla/third_party/tsl/.kokoro/linux/build.sh
+++ b/third_party/xla/third_party/tsl/.kokoro/linux/build.sh
@@ -48,7 +48,7 @@ docker run --name tsl -w /tf/tsl -itd --rm \
     bash
 
 # Build TSL
-docker exec tsl bazel build \
+docker exec tsl bazel --bazelrc=/usertools/cpu.bazelrc build \
     --output_filter="" \
     --keep_going \
     --build_tag_filters=$TAGS_FILTER  \
@@ -58,7 +58,7 @@ docker exec tsl bazel build \
     -- //tsl/...
 
 # Test TSL
-docker exec tsl bazel test \
+docker exec tsl bazel --bazelrc=/usertools/cpu.bazelrc test \
     --output_filter="" \
     --keep_going \
     --flaky_test_attempts=3 \