diff --git a/third_party/xla/xla/backends/gpu/runtime/BUILD b/third_party/xla/xla/backends/gpu/runtime/BUILD
index d96b6dfca36..c1fdc1ecc51 100644
--- a/third_party/xla/xla/backends/gpu/runtime/BUILD
+++ b/third_party/xla/xla/backends/gpu/runtime/BUILD
@@ -4283,8 +4283,8 @@ xla_test(
             "xla_amdgpu_any",
             "no_oss",
         ],
-        "gb200": ["broken"],  # TODO(b/505963304): re-enable when fixed.
-        "gb300": ["broken"],  # TODO(b/505963304): re-enable when fixed.
+        "gb200": ["broken"],  # TODO(b/505963049): re-enable when fixed.
+        "gb300": ["broken"],  # TODO(b/505963049): re-enable when fixed.
     },
     backends = ["gpu"],
     disabled_backends = [],
diff --git a/third_party/xla/xla/backends/gpu/tests/BUILD b/third_party/xla/xla/backends/gpu/tests/BUILD
index f41f0d00fde..9775a8ccd76 100644
--- a/third_party/xla/xla/backends/gpu/tests/BUILD
+++ b/third_party/xla/xla/backends/gpu/tests/BUILD
@@ -1421,8 +1421,8 @@ xla_test(
         "gpu": [
             "multi_gpu",
         ],
-        "gb200": ["broken"],  # TODO(b/505963304): re-enable when fixed.
-        "gb300": ["broken"],  # TODO(b/505963304): re-enable when fixed.
+        "gb200": ["broken"],  # TODO(b/505963049): re-enable when fixed.
+        "gb300": ["broken"],  # TODO(b/505963049): re-enable when fixed.
     },
     backends = ["gpu"],
     deps = [
diff --git a/third_party/xla/xla/stream_executor/cuda/BUILD b/third_party/xla/xla/stream_executor/cuda/BUILD
index 409f089c943..363a2b440b0 100644
--- a/third_party/xla/xla/stream_executor/cuda/BUILD
+++ b/third_party/xla/xla/stream_executor/cuda/BUILD
@@ -1279,8 +1279,8 @@ xla_test(
         "gpu": [
             "multi_gpu",
         ],
-        "gb200": ["broken"],  # TODO(b/505963304): re-enable when fixed.
-        "gb300": ["broken"],  # TODO(b/505963304): re-enable when fixed.
+        "gb200": ["broken"],  # TODO(b/505963049): re-enable when fixed.
+        "gb300": ["broken"],  # TODO(b/505963049): re-enable when fixed.
     },
     backends = ["gpu"],
     tags = ["cuda-only"],
@@ -1721,8 +1721,8 @@ xla_test(
         "gpu": [
             "multi_gpu",
         ],
-        "gb200": ["broken"],  # TODO(b/505963304): re-enable when fixed.
-        "gb300": ["broken"],  # TODO(b/505963304): re-enable when fixed.
+        "gb200": ["broken"],  # TODO(b/505963049): re-enable when fixed.
+        "gb300": ["broken"],  # TODO(b/505963049): re-enable when fixed.
     },
     backends = ["gpu"],
     tags = ["cuda-only"],
diff --git a/third_party/xla/xla/tsl/platform/default/env.cc b/third_party/xla/xla/tsl/platform/default/env.cc
index 6ed6443235f..4b52100e7d6 100644
--- a/third_party/xla/xla/tsl/platform/default/env.cc
+++ b/third_party/xla/xla/tsl/platform/default/env.cc
@@ -206,7 +206,7 @@ class PosixEnv : public Env {
   }
 
   void SchedClosure(absl::AnyInvocable<void()> closure) override {
-    // TODO(b/27290852): Spawning a new thread here is wasteful, but
+    // TODO(b/119634930): Spawning a new thread here is wasteful, but
     // needed to deal with the fact that many `closure` functions are
     // blocking in the current codebase.
     std::thread closure_thread(std::move(closure));
@@ -215,7 +215,7 @@ class PosixEnv : public Env {
 
   void SchedClosureAfter(int64_t micros,
                          absl::AnyInvocable<void()> closure) override {
-    // TODO(b/27290852): Consuming a thread here is wasteful, but this
+    // TODO(b/119634930): Consuming a thread here is wasteful, but this
     // code is (currently) only used in the case where a step fails
     // (AbortStep). This could be replaced by a timer thread
     SchedClosure([this, micros, closure = std::move(closure)]() mutable {