Replace some pwbug/### TODOs with b/###

Change-Id: I66097ff01d206caf6e6b87e07315645037627b0c
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/100461
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Reviewed-by: Keir Mierle <keir@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
diff --git a/pw_allocator/py/pw_allocator/heap_viewer.py b/pw_allocator/py/pw_allocator/heap_viewer.py
index 72da6ff..56e5396 100644
--- a/pw_allocator/py/pw_allocator/heap_viewer.py
+++ b/pw_allocator/py/pw_allocator/heap_viewer.py
@@ -122,8 +122,8 @@
               poison_enabled=False,
               pointer_size=4):
     """Visualization of heap usage."""
-    # TODO(pwbug/236): Add standarized mechanisms to produce dump file and read
-    # heap information from dump file.
+    # TODO(b/235282507): Add standarized mechanisms to produce dump file and
+    # read heap information from dump file.
     aligned_bytes = pointer_size
     header_size = pointer_size * 2
 
diff --git a/pw_assert/BUILD.gn b/pw_assert/BUILD.gn
index da8e9df..7aa80a1 100644
--- a/pw_assert/BUILD.gn
+++ b/pw_assert/BUILD.gn
@@ -105,7 +105,7 @@
 # compatibility with pw_assert's previous C-symbol based API.
 #
 # Warning: The assert facade is in a transitional state, and this target is
-# likely to be removed as the pw_assert API is reassessed. (pwbug/246)
+# likely to be removed as the pw_assert API is reassessed. (b/235149326)
 pw_source_set("assert_compatibility_backend") {
   public_configs = [ ":assert_backend_overrides" ]
   public_deps = [ dir_pw_preprocessor ]
diff --git a/pw_assert/CMakeLists.txt b/pw_assert/CMakeLists.txt
index 766ae9c..c04545f 100644
--- a/pw_assert/CMakeLists.txt
+++ b/pw_assert/CMakeLists.txt
@@ -70,7 +70,7 @@
 )
 
 # Warning: The assert facade is in a transitional state, and this target is
-# likely to be removed as the pw_assert API is reassessed. (pwbug/246)
+# likely to be removed as the pw_assert API is reassessed. (b/235149326)
 pw_add_module_library(pw_assert.assert_compatibility_backend
   HEADERS
     assert_compatibility_public_overrides/pw_assert_backend/assert_backend.h
diff --git a/pw_assert/backend.gni b/pw_assert/backend.gni
index 01a4690..27b57d6 100644
--- a/pw_assert/backend.gni
+++ b/pw_assert/backend.gni
@@ -21,6 +21,6 @@
   # Backend for the pw_assert module's ASSERT facade.
   #
   # Warning: This naming is transitional. Modifying this build argument WILL
-  #     result in future breakages. (pwbug/246)
+  #     result in future breakages. (b/235149326)
   pw_assert_LITE_BACKEND = "${dir_pw_assert}:assert_compatibility_backend"
 }
diff --git a/pw_assert_basic/BUILD.gn b/pw_assert_basic/BUILD.gn
index 9ccc410..f31ab13 100644
--- a/pw_assert_basic/BUILD.gn
+++ b/pw_assert_basic/BUILD.gn
@@ -36,7 +36,7 @@
   public = [ "public/pw_assert_basic/handler.h" ]
 }
 
-# TODO(pwbug/246): This backend implements pw_assert's check backend and the
+# TODO(b/235149326): This backend implements pw_assert's check backend and the
 # temporary compatibility C ABI (pw_assert_HandleFailure()).
 #
 # pw_assert_basic only provides the backend's interface. The implementation is
diff --git a/pw_assert_basic/CMakeLists.txt b/pw_assert_basic/CMakeLists.txt
index 0cd61ac..d2d6936 100644
--- a/pw_assert_basic/CMakeLists.txt
+++ b/pw_assert_basic/CMakeLists.txt
@@ -23,7 +23,7 @@
     pw_preprocessor
 )
 
-# TODO(pwbug/246): This backend implements pw_assert's check backend and the
+# TODO(b/235149326): This backend implements pw_assert's check backend and the
 # temporary compatibility C ABI (pw_assert_HandleFailure()).
 pw_add_module_library(pw_assert_basic.check_backend
   HEADERS
diff --git a/pw_assert_log/BUILD.gn b/pw_assert_log/BUILD.gn
index 714fb1f..28ac04d 100644
--- a/pw_assert_log/BUILD.gn
+++ b/pw_assert_log/BUILD.gn
@@ -47,14 +47,14 @@
     "$dir_pw_preprocessor",
   ]
   sources = [
-    # TODO(pwbug/246): assert_log.cc implements the assert compatibility
+    # TODO(b/235149326): assert_log.cc implements the assert compatibility
     #     backend, but nothing for check_backend.
     "assert_log.cc",
     "public/pw_assert_log/check_log.h",
   ]
 }
 
-# TODO(pwbug/246): Remove this deprecated alias.
+# TODO(b/235149326): Remove this deprecated alias.
 group("pw_assert_log") {
   public_deps = [ ":check_backend" ]
 }
diff --git a/pw_assert_zephyr/CMakeLists.txt b/pw_assert_zephyr/CMakeLists.txt
index ef635d8..3555a38 100644
--- a/pw_assert_zephyr/CMakeLists.txt
+++ b/pw_assert_zephyr/CMakeLists.txt
@@ -18,7 +18,7 @@
   return()
 endif()
 
-# TODO(pwbug/246): This backend implements pw_assert's check backend and the
+# TODO(b/235149326): This backend implements pw_assert's check backend and the
 # temporary compatibility C ABI (pw_assert_HandleFailure()).
 pw_auto_add_simple_module(pw_assert_zephyr
   IMPLEMENTS_FACADE
diff --git a/pw_chrono_embos/BUILD.bazel b/pw_chrono_embos/BUILD.bazel
index b86d63d..7d176b2 100644
--- a/pw_chrono_embos/BUILD.bazel
+++ b/pw_chrono_embos/BUILD.bazel
@@ -71,7 +71,7 @@
         "//pw_chrono:system_clock",
         "//pw_function",
         "//pw_chrono:system_timer_facade",
-        # TODO(pwbug/317): This should depend on embOS but our third parties
+        # TODO(b/234876414): This should depend on embOS but our third parties
         # currently do not have Bazel support.
     ],
 )
@@ -87,7 +87,7 @@
         ":system_clock",
         "//pw_assert",
         "//pw_interrupt:context",
-        # TODO(pwbug/317): This should depend on embOS but our third parties
+        # TODO(b/234876414): This should depend on embOS but our third parties
         # currently do not have Bazel support.
     ],
 )
diff --git a/pw_chrono_freertos/BUILD.bazel b/pw_chrono_freertos/BUILD.bazel
index 1fafeda..095e4f6 100644
--- a/pw_chrono_freertos/BUILD.bazel
+++ b/pw_chrono_freertos/BUILD.bazel
@@ -73,7 +73,7 @@
         "//pw_chrono:system_clock",
         "//pw_function",
         "//pw_chrono:system_timer_facade",
-        # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+        # TODO(b/234876414): This should depend on FreeRTOS but our third parties
         # currently do not have Bazel support.
     ],
 )
@@ -88,7 +88,7 @@
         "//pw_chrono:system_timer_facade",
         ":system_clock",
         "//pw_assert",
-        # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+        # TODO(b/234876414): This should depend on FreeRTOS but our third parties
         # currently do not have Bazel support.
     ],
 )
diff --git a/pw_kvs/public/pw_kvs/flash_memory.h b/pw_kvs/public/pw_kvs/flash_memory.h
index 3ef5cfe..0ebfae3 100644
--- a/pw_kvs/public/pw_kvs/flash_memory.h
+++ b/pw_kvs/public/pw_kvs/flash_memory.h
@@ -42,7 +42,7 @@
   // The flash address is in the range of: 0 to FlashSize.
   typedef uint32_t Address;
 
-  // TODO(pwbug/246): This can be constexpr when tokenized asserts are fixed.
+  // TODO(b/235149326): This can be constexpr when tokenized asserts are fixed.
   FlashMemory(size_t sector_size,
               size_t sector_count,
               size_t alignment,
diff --git a/pw_protobuf/public/pw_protobuf/internal/codegen.h b/pw_protobuf/public/pw_protobuf/internal/codegen.h
index f0fc2ca..7631229 100644
--- a/pw_protobuf/public/pw_protobuf/internal/codegen.h
+++ b/pw_protobuf/public/pw_protobuf/internal/codegen.h
@@ -143,7 +143,7 @@
   uint32_t field_number_;
   uint32_t field_info_;
   size_t field_offset_;
-  // TODO(pwbug/649): Could be replaced by a class MessageDescriptor*
+  // TODO(b/234875722): Could be replaced by a class MessageDescriptor*
   const span<const MessageField>* nested_message_fields_;
 };
 static_assert(sizeof(MessageField) <= sizeof(size_t) * 4,
diff --git a/pw_rpc/channel.cc b/pw_rpc/channel.cc
index 46cb154..4df7447 100644
--- a/pw_rpc/channel.cc
+++ b/pw_rpc/channel.cc
@@ -26,7 +26,7 @@
 namespace pw::rpc {
 namespace {
 
-// TODO(pwbug/615): Dynamically allocate this buffer if
+// TODO(b/234876617): Dynamically allocate this buffer if
 //     PW_RPC_DYNAMIC_ALLOCATION is enabled.
 std::array<std::byte, cfg::kEncodingBufferSizeBytes> encoding_buffer
     PW_GUARDED_BY(internal::rpc_lock());
diff --git a/pw_rpc/endpoint.cc b/pw_rpc/endpoint.cc
index b3c4d59..3ba6f39 100644
--- a/pw_rpc/endpoint.cc
+++ b/pw_rpc/endpoint.cc
@@ -67,9 +67,9 @@
   RegisterUniqueCall(call);
 
   if (existing_call != nullptr) {
-    // TODO(pwbug/597): Ensure call object is locked when calling callback. For
-    //     on_error, could potentially move the callback and call it after the
-    //     lock is released.
+    // TODO(b/234876851): Ensure call object is locked when calling callback.
+    //     For on_error, could potentially move the callback and call it after
+    //     the lock is released.
     existing_call->HandleError(Status::Cancelled());
     rpc_lock().lock();
   }
diff --git a/pw_rpc/internal/packet.proto b/pw_rpc/internal/packet.proto
index 2862eb4..eb29072 100644
--- a/pw_rpc/internal/packet.proto
+++ b/pw_rpc/internal/packet.proto
@@ -34,7 +34,7 @@
   CLIENT_ERROR = 4;
 
   // Deprecated, do not use. Send a CLIENT_ERROR with status CANCELLED instead.
-  // TODO(pwbug/512): Remove this packet type.
+  // TODO(b/234879973): Remove this packet type.
   DEPRECATED_CANCEL = 6;
 
   // A client stream has completed.
@@ -47,7 +47,7 @@
 
   // Deprecated, do not use. Formerly was used as the last packet in a server
   // stream.
-  // TODO(pwbug/512): Remove this packet type.
+  // TODO(b/234879973): Remove this packet type.
   DEPRECATED_SERVER_STREAM_END = 3;
 
   // The server was unable to process a request.
diff --git a/pw_rpc/packet.cc b/pw_rpc/packet.cc
index de37ab1..5a46428 100644
--- a/pw_rpc/packet.cc
+++ b/pw_rpc/packet.cc
@@ -75,7 +75,7 @@
     return status;
   }
 
-  // TODO(pwbug/512): CANCEL is equivalent to CLIENT_ERROR with status
+  // TODO(b/234879973): CANCEL is equivalent to CLIENT_ERROR with status
   //     CANCELLED. Remove this workaround when CANCEL is removed.
   if (packet.type() == PacketType::DEPRECATED_CANCEL) {
     packet.set_status(Status::Cancelled());
diff --git a/pw_rpc/public/pw_rpc/internal/call.h b/pw_rpc/public/pw_rpc/internal/call.h
index 558d47d..87bdd42 100644
--- a/pw_rpc/public/pw_rpc/internal/call.h
+++ b/pw_rpc/public/pw_rpc/internal/call.h
@@ -134,7 +134,7 @@
   // is closed.
   void SendInitialClientRequest(ConstByteSpan payload)
       PW_UNLOCK_FUNCTION(rpc_lock()) {
-    // TODO(pwbug/597): Ensure the call object is locked before releasing the
+    // TODO(b/234876851): Ensure the call object is locked before releasing the
     //     RPC mutex.
     if (const Status status = SendPacket(PacketType::REQUEST, payload);
         !status.ok()) {
@@ -150,7 +150,7 @@
   void HandlePayload(ConstByteSpan message) const
       PW_UNLOCK_FUNCTION(rpc_lock()) {
     const bool invoke = on_next_ != nullptr;
-    // TODO(pwbug/597): Ensure on_next_ is properly guarded.
+    // TODO(b/234876851): Ensure on_next_ is properly guarded.
     rpc_lock().unlock();
 
     if (invoke) {
@@ -170,7 +170,7 @@
   void HandleChannelClose() PW_EXCLUSIVE_LOCKS_REQUIRED(rpc_lock()) {
     // Locking here is problematic because CallOnError releases rpc_lock().
     //
-    // pwbug/597 must be addressed before the locking here can be cleaned up.
+    // b/234876851 must be addressed before the locking here can be cleaned up.
     MarkClosed();
 
     CallOnError(Status::Aborted());
@@ -258,7 +258,7 @@
   void CallOnError(Status error) PW_UNLOCK_FUNCTION(rpc_lock()) {
     const bool invoke = on_error_ != nullptr;
 
-    // TODO(pwbug/597): Ensure on_error_ is properly guarded.
+    // TODO(b/234876851): Ensure on_error_ is properly guarded.
     rpc_lock().unlock();
     if (invoke) {
       on_error_(error);
diff --git a/pw_rpc/public/pw_rpc/internal/client_call.h b/pw_rpc/public/pw_rpc/internal/client_call.h
index c4d9c10..02d46f1 100644
--- a/pw_rpc/public/pw_rpc/internal/client_call.h
+++ b/pw_rpc/public/pw_rpc/internal/client_call.h
@@ -113,7 +113,7 @@
 
   void set_on_completed(Function<void(ConstByteSpan, Status)>&& on_completed)
       PW_LOCKS_EXCLUDED(rpc_lock()) {
-    // TODO(pwbug/597): Ensure on_completed_ is properly guarded.
+    // TODO(b/234876851): Ensure on_completed_ is properly guarded.
     LockGuard lock(rpc_lock());
     set_on_completed_locked(std::move(on_completed));
   }
@@ -160,7 +160,7 @@
     UnregisterAndMarkClosed();
     rpc_lock().unlock();
 
-    // TODO(pwbug/597): Ensure on_completed_ is properly guarded.
+    // TODO(b/234876851): Ensure on_completed_ is properly guarded.
     if (invoke_callback) {
       on_completed_(status);
     }
@@ -195,7 +195,7 @@
 
   void set_on_completed(Function<void(Status)>&& on_completed)
       PW_LOCKS_EXCLUDED(rpc_lock()) {
-    // TODO(pwbug/597): Ensure on_completed_ is properly guarded.
+    // TODO(b/234876851): Ensure on_completed_ is properly guarded.
     LockGuard lock(rpc_lock());
     set_on_completed_locked(std::move(on_completed));
   }
diff --git a/pw_rpc/public/pw_rpc/internal/server_call.h b/pw_rpc/public/pw_rpc/internal/server_call.h
index c7a9c53..e4b2cbf 100644
--- a/pw_rpc/public/pw_rpc/internal/server_call.h
+++ b/pw_rpc/public/pw_rpc/internal/server_call.h
@@ -25,7 +25,7 @@
  public:
   void HandleClientStreamEnd() PW_UNLOCK_FUNCTION(rpc_lock()) {
     MarkClientStreamCompleted();
-    // TODO(pwbug/597): Ensure on_client_stream_end_ is properly guarded.
+    // TODO(b/234876851): Ensure on_client_stream_end_ is properly guarded.
     rpc_lock().unlock();
 
 #if PW_RPC_CLIENT_STREAM_END_CALLBACK
@@ -63,7 +63,7 @@
   template <typename UnusedType = void>
   void set_on_client_stream_end(
       [[maybe_unused]] Function<void()>&& on_client_stream_end) {
-    // TODO(pwbug/597): Ensure on_client_stream_end_ is properly guarded.
+    // TODO(b/234876851): Ensure on_client_stream_end_ is properly guarded.
     static_assert(
         cfg::kClientStreamEndCallbackEnabled<UnusedType>,
         "The client stream end callback is disabled, so "
diff --git a/pw_sync/binary_semaphore_facade_test.cc b/pw_sync/binary_semaphore_facade_test.cc
index 7f9ce30..c52d792 100644
--- a/pw_sync/binary_semaphore_facade_test.cc
+++ b/pw_sync/binary_semaphore_facade_test.cc
@@ -53,7 +53,7 @@
   EXPECT_FALSE(semaphore.try_acquire());
 }
 
-// TODO(pwbug/291): Add real concurrency tests once we have pw::thread.
+// TODO(b/235284163): Add real concurrency tests once we have pw::thread.
 
 TEST(BinarySemaphore, Release) {
   BinarySemaphore semaphore;
diff --git a/pw_sync/counting_semaphore_facade_test.cc b/pw_sync/counting_semaphore_facade_test.cc
index 2fcc983..c7224b2 100644
--- a/pw_sync/counting_semaphore_facade_test.cc
+++ b/pw_sync/counting_semaphore_facade_test.cc
@@ -59,7 +59,7 @@
   EXPECT_FALSE(semaphore.try_acquire());
 }
 
-// TODO(pwbug/291): Add real concurrency tests once we have pw::thread.
+// TODO(b/235284163): Add real concurrency tests once we have pw::thread.
 
 TEST(CountingSemaphore, SingleRelease) {
   CountingSemaphore semaphore;
diff --git a/pw_sync/interrupt_spin_lock_facade_test.cc b/pw_sync/interrupt_spin_lock_facade_test.cc
index fa3a723..86a751c 100644
--- a/pw_sync/interrupt_spin_lock_facade_test.cc
+++ b/pw_sync/interrupt_spin_lock_facade_test.cc
@@ -37,13 +37,13 @@
   interrupt_spin_lock.unlock();
 }
 
-// TODO(pwbug/291): Add real concurrency tests once we have pw::thread on SMP
+// TODO(b/235284163): Add real concurrency tests once we have pw::thread on SMP
 // systems given that uniprocessor systems cannot fail to acquire an ISL.
 
 InterruptSpinLock static_interrupt_spin_lock;
 TEST(InterruptSpinLock, LockUnlockStatic) {
   static_interrupt_spin_lock.lock();
-  // TODO(pwbug/291): Ensure other cores fail to lock when its locked.
+  // TODO(b/235284163): Ensure other cores fail to lock when its locked.
   // EXPECT_FALSE(static_interrupt_spin_lock.try_lock());
   static_interrupt_spin_lock.unlock();
 }
@@ -53,7 +53,7 @@
   const bool locked = interrupt_spin_lock.try_lock();
   EXPECT_TRUE(locked);
   if (locked) {
-    // TODO(pwbug/291): Ensure other cores fail to lock when its locked.
+    // TODO(b/235284163): Ensure other cores fail to lock when its locked.
     // EXPECT_FALSE(interrupt_spin_lock.try_lock());
     interrupt_spin_lock.unlock();
   }
@@ -62,7 +62,7 @@
 TEST(VirtualInterruptSpinLock, LockUnlock) {
   pw::sync::VirtualInterruptSpinLock interrupt_spin_lock;
   interrupt_spin_lock.lock();
-  // TODO(pwbug/291): Ensure other cores fail to lock when its locked.
+  // TODO(b/235284163): Ensure other cores fail to lock when its locked.
   // EXPECT_FALSE(interrupt_spin_lock.try_lock());
   interrupt_spin_lock.unlock();
 }
@@ -70,7 +70,7 @@
 VirtualInterruptSpinLock static_virtual_interrupt_spin_lock;
 TEST(VirtualInterruptSpinLock, LockUnlockStatic) {
   static_virtual_interrupt_spin_lock.lock();
-  // TODO(pwbug/291): Ensure other cores fail to lock when its locked.
+  // TODO(b/235284163): Ensure other cores fail to lock when its locked.
   // EXPECT_FALSE(static_virtual_interrupt_spin_lock.try_lock());
   static_virtual_interrupt_spin_lock.unlock();
 }
@@ -84,7 +84,7 @@
 TEST(InterruptSpinLock, TryLockUnlockInC) {
   pw::sync::InterruptSpinLock interrupt_spin_lock;
   ASSERT_TRUE(pw_sync_InterruptSpinLock_CallTryLock(&interrupt_spin_lock));
-  // TODO(pwbug/291): Ensure other cores fail to lock when its locked.
+  // TODO(b/235284163): Ensure other cores fail to lock when its locked.
   // EXPECT_FALSE(pw_sync_InterruptSpinLock_CallTryLock(&interrupt_spin_lock));
   pw_sync_InterruptSpinLock_CallUnlock(&interrupt_spin_lock);
 }
diff --git a/pw_sync/mutex_facade_test.cc b/pw_sync/mutex_facade_test.cc
index 771b003..4c7cdd0 100644
--- a/pw_sync/mutex_facade_test.cc
+++ b/pw_sync/mutex_facade_test.cc
@@ -29,12 +29,12 @@
 
 }  // extern "C"
 
-// TODO(pwbug/291): Add real concurrency tests once we have pw::thread.
+// TODO(b/235284163): Add real concurrency tests once we have pw::thread.
 
 TEST(Mutex, LockUnlock) {
   pw::sync::Mutex mutex;
   mutex.lock();
-  // TODO(pwbug/291): Ensure it fails to lock when already held.
+  // TODO(b/235284163): Ensure it fails to lock when already held.
   // EXPECT_FALSE(mutex.try_lock());
   mutex.unlock();
 }
@@ -42,7 +42,7 @@
 Mutex static_mutex;
 TEST(Mutex, LockUnlockStatic) {
   static_mutex.lock();
-  // TODO(pwbug/291): Ensure it fails to lock when already held.
+  // TODO(b/235284163): Ensure it fails to lock when already held.
   // EXPECT_FALSE(static_mutex.try_lock());
   static_mutex.unlock();
 }
@@ -52,7 +52,7 @@
   const bool locked = mutex.try_lock();
   EXPECT_TRUE(locked);
   if (locked) {
-    // TODO(pwbug/291): Ensure it fails to lock when already held.
+    // TODO(b/235284163): Ensure it fails to lock when already held.
     // EXPECT_FALSE(mutex.try_lock());
     mutex.unlock();
   }
@@ -61,7 +61,7 @@
 TEST(VirtualMutex, LockUnlock) {
   pw::sync::VirtualMutex mutex;
   mutex.lock();
-  // TODO(pwbug/291): Ensure it fails to lock when already held.
+  // TODO(b/235284163): Ensure it fails to lock when already held.
   // EXPECT_FALSE(mutex.try_lock());
   mutex.unlock();
 }
@@ -69,7 +69,7 @@
 VirtualMutex static_virtual_mutex;
 TEST(VirtualMutex, LockUnlockStatic) {
   static_virtual_mutex.lock();
-  // TODO(pwbug/291): Ensure it fails to lock when already held.
+  // TODO(b/235284163): Ensure it fails to lock when already held.
   // EXPECT_FALSE(static_virtual_mutex.try_lock());
   static_virtual_mutex.unlock();
 }
@@ -83,7 +83,7 @@
 TEST(Mutex, TryLockUnlockInC) {
   pw::sync::Mutex mutex;
   ASSERT_TRUE(pw_sync_Mutex_CallTryLock(&mutex));
-  // TODO(pwbug/291): Ensure it fails to lock when already held.
+  // TODO(b/235284163): Ensure it fails to lock when already held.
   // EXPECT_FALSE(pw_sync_Mutex_CallTryLock(&mutex));
   pw_sync_Mutex_CallUnlock(&mutex);
 }
diff --git a/pw_sync/thread_notification_facade_test.cc b/pw_sync/thread_notification_facade_test.cc
index c8f6eaa..fa10dfa 100644
--- a/pw_sync/thread_notification_facade_test.cc
+++ b/pw_sync/thread_notification_facade_test.cc
@@ -25,7 +25,7 @@
   EXPECT_FALSE(notification.try_acquire());
 }
 
-// TODO(pwbug/291): Add real concurrency tests.
+// TODO(b/235284163): Add real concurrency tests.
 
 TEST(ThreadNotification, Release) {
   ThreadNotification notification;
diff --git a/pw_sync/timed_mutex_facade_test.cc b/pw_sync/timed_mutex_facade_test.cc
index 75ba2b6..c632337 100644
--- a/pw_sync/timed_mutex_facade_test.cc
+++ b/pw_sync/timed_mutex_facade_test.cc
@@ -45,13 +45,14 @@
 constexpr pw_chrono_SystemClock_Duration kRoundedArbitraryDurationInC =
     PW_SYSTEM_CLOCK_MS(42);
 
-// TODO(pwbug/291): Add real concurrency tests once we have pw::thread.
+// TODO(b/235284163): Add real concurrency tests once we have pw::thread.
 
 TEST(TimedMutex, LockUnlock) {
   pw::sync::TimedMutex mutex;
   mutex.lock();
   mutex.unlock();
-  // TODO(pwbug/291): Ensure it fails to lock when already held by someone else.
+  // TODO(b/235284163): Ensure it fails to lock when already held by someone
+  // else.
   // EXPECT_FALSE(mutex.try_lock());
 }
 
@@ -59,7 +60,8 @@
 TEST(TimedMutex, LockUnlockStatic) {
   static_mutex.lock();
   static_mutex.unlock();
-  // TODO(pwbug/291): Ensure it fails to lock when already held by someone else.
+  // TODO(b/235284163): Ensure it fails to lock when already held by someone
+  // else.
   // EXPECT_FALSE(static_mutex.try_lock());
 }
 
@@ -71,7 +73,7 @@
     // EXPECT_FALSE(mutex.try_lock());
     mutex.unlock();
   }
-  // TODO(pwbug/291): Ensure it fails to lock when already held by someone
+  // TODO(b/235284163): Ensure it fails to lock when already held by someone
   // else.
 }
 
@@ -86,11 +88,11 @@
     EXPECT_LT(time_elapsed, kRoundedArbitraryDuration);
     mutex.unlock();
   }
-  // TODO(pwbug/291): Ensure it blocks and fails to lock when already held by
+  // TODO(b/235284163): Ensure it blocks and fails to lock when already held by
   // someone else.
-  // TODO(pwbug/291): Ensure it does not block and fails to lock when already
+  // TODO(b/235284163): Ensure it does not block and fails to lock when already
   // held by someone else and a zero length duration is used.
-  // TODO(pwbug/291): Ensure it does not block and fails to lock when already
+  // TODO(b/235284163): Ensure it does not block and fails to lock when already
   // held by someone else and a negative duration is used.
 }
 
@@ -105,18 +107,19 @@
     EXPECT_LT(SystemClock::now(), deadline);
     mutex.unlock();
   }
-  // TODO(pwbug/291): Ensure it blocks and fails to lock when already held by
+  // TODO(b/235284163): Ensure it blocks and fails to lock when already held by
   // someone else.
-  // TODO(pwbug/291): Ensure it does not block and fails to lock when already
+  // TODO(b/235284163): Ensure it does not block and fails to lock when already
   // held by someone else and now is used.
-  // TODO(pwbug/291): Ensure it does not block and fails to lock when already
+  // TODO(b/235284163): Ensure it does not block and fails to lock when already
   // held by someone else and a timestamp in the past is used.
 }
 
 TEST(VirtualTimedMutex, LockUnlock) {
   pw::sync::VirtualTimedMutex mutex;
   mutex.lock();
-  // TODO(pwbug/291): Ensure it fails to lock when already held by someone else.
+  // TODO(b/235284163): Ensure it fails to lock when already held by someone
+  // else.
   // EXPECT_FALSE(mutex.try_lock());
   mutex.unlock();
 }
@@ -124,7 +127,8 @@
 VirtualTimedMutex static_virtual_mutex;
 TEST(VirtualTimedMutex, LockUnlockStatic) {
   static_virtual_mutex.lock();
-  // TODO(pwbug/291): Ensure it fails to lock when already held by someone else.
+  // TODO(b/235284163): Ensure it fails to lock when already held by someone
+  // else.
   // EXPECT_FALSE(static_virtual_mutex.try_lock());
   static_virtual_mutex.unlock();
 }
@@ -138,7 +142,8 @@
 TEST(TimedMutex, TryLockUnlockInC) {
   pw::sync::TimedMutex mutex;
   ASSERT_TRUE(pw_sync_TimedMutex_CallTryLock(&mutex));
-  // TODO(pwbug/291): Ensure it fails to lock when already held by someone else.
+  // TODO(b/235284163): Ensure it fails to lock when already held by someone
+  // else.
   // EXPECT_FALSE(pw_sync_TimedMutex_CallTryLock(&mutex));
   pw_sync_TimedMutex_CallUnlock(&mutex);
 }
@@ -153,11 +158,11 @@
       pw_chrono_SystemClock_TimeElapsed(before, pw_chrono_SystemClock_Now());
   EXPECT_LT(time_elapsed.ticks, kRoundedArbitraryDurationInC.ticks);
   pw_sync_TimedMutex_CallUnlock(&mutex);
-  // TODO(pwbug/291): Ensure it blocks and fails to lock when already held by
+  // TODO(b/235284163): Ensure it blocks and fails to lock when already held by
   // someone else.
-  // TODO(pwbug/291): Ensure it does not block and fails to lock when already
+  // TODO(b/235284163): Ensure it does not block and fails to lock when already
   // held by someone else and a zero length duration is used.
-  // TODO(pwbug/291): Ensure it does not block and fails to lock when already
+  // TODO(b/235284163): Ensure it does not block and fails to lock when already
   // held by someone else and a negative duration is used.
 }
 
@@ -171,11 +176,11 @@
   EXPECT_LT(pw_chrono_SystemClock_Now().duration_since_epoch.ticks,
             deadline.duration_since_epoch.ticks);
   pw_sync_TimedMutex_CallUnlock(&mutex);
-  // TODO(pwbug/291): Ensure it blocks and fails to lock when already held by
+  // TODO(b/235284163): Ensure it blocks and fails to lock when already held by
   // someone else.
-  // TODO(pwbug/291): Ensure it does not block and fails to lock when already
+  // TODO(b/235284163): Ensure it does not block and fails to lock when already
   // held by someone else and now is used.
-  // TODO(pwbug/291): Ensure it does not block and fails to lock when already
+  // TODO(b/235284163): Ensure it does not block and fails to lock when already
   // held by someone else and a timestamp in the past is used.
 }
 
diff --git a/pw_sync/timed_thread_notification_facade_test.cc b/pw_sync/timed_thread_notification_facade_test.cc
index 84bb415..ee1da89 100644
--- a/pw_sync/timed_thread_notification_facade_test.cc
+++ b/pw_sync/timed_thread_notification_facade_test.cc
@@ -35,7 +35,7 @@
   EXPECT_FALSE(notification.try_acquire());
 }
 
-// TODO(pwbug/291): Add real concurrency tests.
+// TODO(b/235284163): Add real concurrency tests.
 
 TEST(TimedThreadNotification, Release) {
   TimedThreadNotification notification;
diff --git a/pw_sync_embos/BUILD.bazel b/pw_sync_embos/BUILD.bazel
index 23ad1ff..81f2e83 100644
--- a/pw_sync_embos/BUILD.bazel
+++ b/pw_sync_embos/BUILD.bazel
@@ -37,7 +37,7 @@
         "//pw_build/constraints/rtos:embos",
     ],
     deps = [
-        # TODO(pwbug/317): This should depend on embOS but our third parties
+        # TODO(b/234876414): This should depend on embOS but our third parties
         # currently do not have Bazel support.
         "//pw_chrono:system_clock",
         "//pw_chrono_embos:system_clock_headers",
@@ -75,7 +75,7 @@
         "//pw_build/constraints/rtos:embos",
     ],
     deps = [
-        # TODO(pwbug/317): This should depend on embOS but our third parties
+        # TODO(b/234876414): This should depend on embOS but our third parties
         # currently do not have Bazel support.
         "//pw_chrono:system_clock",
         "//pw_chrono_embos:system_clock_headers",
@@ -113,7 +113,7 @@
         "//pw_build/constraints/rtos:embos",
     ],
     deps = [
-        # TODO(pwbug/317): This should depend on embOS but our third parties
+        # TODO(b/234876414): This should depend on embOS but our third parties
         # currently do not have Bazel support.
         "//pw_sync:mutex_facade",
     ],
@@ -144,7 +144,7 @@
         "//pw_build/constraints/rtos:embos",
     ],
     deps = [
-        # TODO(pwbug/317): This should depend on embOS but our third parties
+        # TODO(b/234876414): This should depend on embOS but our third parties
         # currently do not have Bazel support.
         "//pw_chrono:system_clock",
         "//pw_sync:timed_mutex_facade",
@@ -182,7 +182,7 @@
     target_compatible_with = [
         "//pw_build/constraints/rtos:embos",
     ],
-    # TODO(pwbug/317): This should depend on embOS but our third parties
+    # TODO(b/234876414): This should depend on embOS but our third parties
     # currently do not have Bazel support.
 )
 
diff --git a/pw_sync_freertos/BUILD.bazel b/pw_sync_freertos/BUILD.bazel
index a541b7c..48a66a8 100644
--- a/pw_sync_freertos/BUILD.bazel
+++ b/pw_sync_freertos/BUILD.bazel
@@ -37,7 +37,7 @@
         "//pw_build/constraints/rtos:freertos",
     ],
     deps = [
-        # TODO(pwbug/317): This should depend on FreeRTOS but our third parties currently
+        # TODO(b/234876414): This should depend on FreeRTOS but our third parties currently
         # do not have Bazel support.
         "//pw_assert",
         "//pw_chrono:system_clock",
@@ -77,7 +77,7 @@
         "//pw_build/constraints/rtos:freertos",
     ],
     deps = [
-        # TODO(pwbug/317): This should depend on FreeRTOS but our third parties currently
+        # TODO(b/234876414): This should depend on FreeRTOS but our third parties currently
         # do not have Bazel support.
         "//pw_assert",
         "//pw_sync:counting_semaphore_facade",
@@ -118,7 +118,7 @@
         "//pw_build/constraints/rtos:freertos",
     ],
     deps = [
-        # TODO(pwbug/317): This should depend on FreeRTOS but our third parties currently
+        # TODO(b/234876414): This should depend on FreeRTOS but our third parties currently
         # do not have Bazel support.
         "//pw_assert",
     ],
@@ -152,7 +152,7 @@
         "//pw_build/constraints/rtos:freertos",
     ],
     deps = [
-        # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+        # TODO(b/234876414): This should depend on FreeRTOS but our third parties
         # currently do not have Bazel support.
         "//pw_interrupt:context",
     ],
@@ -188,7 +188,7 @@
         "//pw_build/constraints/rtos:freertos",
     ],
     deps = [
-        # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+        # TODO(b/234876414): This should depend on FreeRTOS but our third parties
         # currently do not have Bazel support.
         "//pw_chrono:system_clock",
         "//pw_sync:timed_thread_notification_facade",
@@ -226,7 +226,7 @@
         "//pw_build/constraints/rtos:freertos",
     ],
     deps = [
-        # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+        # TODO(b/234876414): This should depend on FreeRTOS but our third parties
         # currently do not have Bazel support.
         "//pw_chrono:system_clock",
         "//pw_sync:timed_mutex_facade",
@@ -265,7 +265,7 @@
     target_compatible_with = [
         "//pw_build/constraints/rtos:freertos",
     ],
-    # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+    # TODO(b/234876414): This should depend on FreeRTOS but our third parties
     # currently do not have Bazel support.
 )
 
@@ -298,7 +298,7 @@
 #     target_compatible_with = [
 #         "//pw_build/constraints/rtos:freertos",
 #     ],
-#     # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+#     # TODO(b/234876414): This should depend on FreeRTOS but our third parties
 #     # currently do not have Bazel support.
 #     deps = [
 #         "//pw_chrono:system_clock",
@@ -345,7 +345,7 @@
 #    srcs = [
 #        "timed_thread_notification_test.cc",
 #    ],
-#    # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+#    # TODO(b/234876414): This should depend on FreeRTOS but our third parties
 #    # currently do not have Bazel support.
 #    deps = [
 #        "//pw_chrono:system_clock",
diff --git a/pw_sync_threadx/BUILD.bazel b/pw_sync_threadx/BUILD.bazel
index cb78f9e..2b767d8 100644
--- a/pw_sync_threadx/BUILD.bazel
+++ b/pw_sync_threadx/BUILD.bazel
@@ -37,7 +37,7 @@
         "//pw_build/constraints/rtos:threadx",
     ],
     deps = [
-        # TODO(pwbug/317): This should depend on ThreadX but our third parties
+        # TODO(b/234876414): This should depend on ThreadX but our third parties
         # currently do not have Bazel support.
         "//pw_chrono:system_clock",
     ],
@@ -75,7 +75,7 @@
         "//pw_build/constraints/rtos:threadx",
     ],
     deps = [
-        # TODO(pwbug/317): This should depend on ThreadX but our third parties
+        # TODO(b/234876414): This should depend on ThreadX but our third parties
         # currently do not have Bazel support.
         # do not have Bazel support.
         "//pw_chrono:system_clock",
@@ -114,7 +114,7 @@
         "//pw_build/constraints/rtos:threadx",
     ],
     deps = [
-        # TODO(pwbug/317): This should depend on ThreadX but our third parties currently
+        # TODO(b/234876414): This should depend on ThreadX but our third parties currently
         # do not have Bazel support.
         "//pw_sync:mutex_facade",
     ],
@@ -145,7 +145,7 @@
         "//pw_build/constraints/rtos:threadx",
     ],
     deps = [
-        # TODO(pwbug/317): This should depend on ThreadX but our third parties currently
+        # TODO(b/234876414): This should depend on ThreadX but our third parties currently
         # do not have Bazel support.
         "//pw_chrono:system_clock",
         "//pw_sync:timed_mutex_facade",
@@ -180,7 +180,7 @@
         "public",
         "public_overrides",
     ],
-    # TODO(pwbug/317): This should depend on ThreadX but our third parties currently
+    # TODO(b/234876414): This should depend on ThreadX but our third parties currently
     # do not have Bazel support.
     target_compatible_with = [
         "//pw_build/constraints/rtos:threadx",
diff --git a/pw_system/BUILD.bazel b/pw_system/BUILD.bazel
index 0a16c57..462063a 100644
--- a/pw_system/BUILD.bazel
+++ b/pw_system/BUILD.bazel
@@ -204,7 +204,7 @@
         "freertos_target_hooks.cc",
     ],
 
-    # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+    # TODO(b/234876414): This should depend on FreeRTOS but our third parties
     # currently do not have Bazel support.
     deps = [
         "//pw_thread:thread",
diff --git a/pw_system/CMakeLists.txt b/pw_system/CMakeLists.txt
index e63e71f..93b30d5 100644
--- a/pw_system/CMakeLists.txt
+++ b/pw_system/CMakeLists.txt
@@ -143,7 +143,7 @@
   PRIVATE_DEPS
     pw_thread.thread
     pw_thread_freertos.thread
-    # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+    # TODO(b/234876414): This should depend on FreeRTOS but our third parties
     # currently do not have CMake support.
 )
 
diff --git a/pw_thread_embos/BUILD.bazel b/pw_thread_embos/BUILD.bazel
index da4635a..a1fcd99 100644
--- a/pw_thread_embos/BUILD.bazel
+++ b/pw_thread_embos/BUILD.bazel
@@ -41,7 +41,7 @@
         ":id_headers",
         "//pw_thread:id_facade",
     ],
-    # TODO(pwbug/317): This should depend on embOS but our third parties
+    # TODO(b/234876414): This should depend on embOS but our third parties
     # currently do not have Bazel support.
 )
 
@@ -72,7 +72,7 @@
         "//pw_chrono_embos:system_clock_headers",
         "//pw_thread:sleep_facade",
     ],
-    # TODO(pwbug/317): This should depend on embOS but our third parties
+    # TODO(b/234876414): This should depend on embOS but our third parties
     # currently do not have Bazel support.
 )
 
@@ -98,7 +98,7 @@
         "//pw_string",
         "//pw_thread:thread_headers",
     ],
-    # TODO(pwbug/317): This should depend on embOS but our third parties
+    # TODO(b/234876414): This should depend on embOS but our third parties
     # currently do not have Bazel support.
 )
 
@@ -112,7 +112,7 @@
         ":thread_headers",
         "//pw_assert",
     ],
-    # TODO(pwbug/317): This should depend on embOS but our third parties
+    # TODO(b/234876414): This should depend on embOS but our third parties
     # currently do not have Bazel support.
 )
 
@@ -139,7 +139,7 @@
         "public",
         "public_overrides",
     ],
-    # TODO(pwbug/317): This should depend on embOS but our third parties
+    # TODO(b/234876414): This should depend on embOS but our third parties
     # currently do not have Bazel support.
 )
 
@@ -163,7 +163,7 @@
         "//pw_function",
         "//pw_status",
     ],
-    # TODO(pwbug/317): This should depend on embOS but our third parties
+    # TODO(b/234876414): This should depend on embOS but our third parties
     # currently do not have Bazel support.
 )
 
@@ -185,6 +185,6 @@
         "//pw_thread:protos",
         "//pw_thread:snapshot",
     ],
-    # TODO(pwbug/317): This should depend on embOS but our third parties
+    # TODO(b/234876414): This should depend on embOS but our third parties
     # currently do not have Bazel support.
 )
diff --git a/pw_thread_freertos/BUILD.bazel b/pw_thread_freertos/BUILD.bazel
index a03e530..8bfa58f 100644
--- a/pw_thread_freertos/BUILD.bazel
+++ b/pw_thread_freertos/BUILD.bazel
@@ -43,7 +43,7 @@
         ":id_headers",
         "//pw_thread:id_facade",
     ],
-    # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+    # TODO(b/234876414): This should depend on FreeRTOS but our third parties
     # currently do not have Bazel support.
 )
 
@@ -74,7 +74,7 @@
         "//pw_chrono_freertos:system_clock_headers",
         "//pw_thread:sleep_facade",
     ],
-    # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+    # TODO(b/234876414): This should depend on FreeRTOS but our third parties
     # currently do not have Bazel support.
 )
 
@@ -101,7 +101,7 @@
         "//pw_sync:binary_semaphore",
         "//pw_thread:thread_headers",
     ],
-    # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+    # TODO(b/234876414): This should depend on FreeRTOS but our third parties
     # currently do not have Bazel support.
 )
 
@@ -115,7 +115,7 @@
         ":thread_headers",
         "//pw_assert",
     ],
-    # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+    # TODO(b/234876414): This should depend on FreeRTOS but our third parties
     # currently do not have Bazel support.
 )
 
@@ -171,7 +171,7 @@
         "public",
         "public_overrides",
     ],
-    # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+    # TODO(b/234876414): This should depend on FreeRTOS but our third parties
     # currently do not have Bazel support.
 )
 
@@ -195,7 +195,7 @@
         "//pw_function",
         "//pw_status",
     ],
-    # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+    # TODO(b/234876414): This should depend on FreeRTOS but our third parties
     # currently do not have Bazel support.
 )
 
@@ -217,7 +217,7 @@
         "//pw_thread:protos",
         "//pw_thread:snapshot",
     ],
-    # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+    # TODO(b/234876414): This should depend on FreeRTOS but our third parties
     # currently do not have Bazel support.
 )
 
@@ -227,7 +227,7 @@
         "public/pw_thread_freertos/freertos_tsktcb.h",
     ],
     includes = ["public"],
-    # TODO(pwbug/317): This should depend on FreeRTOS but our third parties
+    # TODO(b/234876414): This should depend on FreeRTOS but our third parties
     # currently do not have Bazel support.
 )
 
diff --git a/pw_thread_threadx/BUILD.bazel b/pw_thread_threadx/BUILD.bazel
index fc3718d..f6cba33 100644
--- a/pw_thread_threadx/BUILD.bazel
+++ b/pw_thread_threadx/BUILD.bazel
@@ -42,7 +42,7 @@
         ":id_headers",
         "//pw_thread:id_facade",
     ],
-    # TODO(pwbug/317): This should depend on ThreadX but our third parties
+    # TODO(b/234876414): This should depend on ThreadX but our third parties
     # currently do not have Bazel support.
 )
 
@@ -68,7 +68,7 @@
         "//pw_string",
         "//pw_thread:thread_headers",
     ],
-    # TODO(pwbug/317): This should depend on ThreadX but our third parties
+    # TODO(b/234876414): This should depend on ThreadX but our third parties
     # currently do not have Bazel support.
 )
 
@@ -82,7 +82,7 @@
         ":thread_headers",
         "//pw_assert",
     ],
-    # TODO(pwbug/317): This should depend on ThreadX but our third parties
+    # TODO(b/234876414): This should depend on ThreadX but our third parties
     # currently do not have Bazel support.
 )
 
@@ -134,7 +134,7 @@
         "//pw_chrono_threadx:system_clock_headers",
         "//pw_thread:sleep_facade",
     ],
-    # TODO(pwbug/317): This should depend on ThreadX but our third parties
+    # TODO(b/234876414): This should depend on ThreadX but our third parties
     # currently do not have Bazel support.
 )
 
@@ -148,7 +148,7 @@
         "public",
         "public_overrides",
     ],
-    # TODO(pwbug/317): This should depend on ThreadX but our third parties
+    # TODO(b/234876414): This should depend on ThreadX but our third parties
     # currently do not have Bazel support.
 )
 
@@ -172,7 +172,7 @@
         "//pw_function",
         "//pw_status",
     ],
-    # TODO(pwbug/317): This should depend on ThreadX but our third parties
+    # TODO(b/234876414): This should depend on ThreadX but our third parties
     # currently do not have Bazel support.
 )
 
@@ -193,6 +193,6 @@
         "//pw_status",
         "//pw_thread:protos",
     ],
-    # TODO(pwbug/317): This should depend on ThreadX but our third parties
+    # TODO(b/234876414): This should depend on ThreadX but our third parties
     # currently do not have Bazel support.
 )
diff --git a/pw_tls_client_boringssl/tls_client_boringssl.cc b/pw_tls_client_boringssl/tls_client_boringssl.cc
index 8d8ce80..aeb4c75 100644
--- a/pw_tls_client_boringssl/tls_client_boringssl.cc
+++ b/pw_tls_client_boringssl/tls_client_boringssl.cc
@@ -19,7 +19,7 @@
 namespace backend {
 
 SessionImplementation::SessionImplementation(SessionOptions) {
-  // TODO(pwbug/421): To implement
+  // TODO(b/235291139): To implement
 }
 
 SessionImplementation::~SessionImplementation() = default;
@@ -27,33 +27,33 @@
 }  // namespace backend
 
 Session::Session(const SessionOptions& options) : session_impl_(options) {
-  // TODO(pwbug/421): To implement
+  // TODO(b/235291139): To implement
 }
 
 Session::~Session() = default;
 
 Result<Session*> Session::Create(const SessionOptions&) {
-  // TODO(pwbug/421): To implement
+  // TODO(b/235291139): To implement
   return PW_STATUS_UNIMPLEMENTED;
 }
 
 Status Session::Open() {
-  // TODO(pwbug/421): To implement
+  // TODO(b/235291139): To implement
   return PW_STATUS_UNIMPLEMENTED;
 }
 
 Status Session::Close() {
-  // TODO(pwbug/421): To implement
+  // TODO(b/235291139): To implement
   return PW_STATUS_UNIMPLEMENTED;
 }
 
 StatusWithSize Session::DoRead(ByteSpan) {
-  // TODO(pwbug/421): To implement
+  // TODO(b/235291139): To implement
   return StatusWithSize(PW_STATUS_UNIMPLEMENTED, 0);
 }
 
 Status Session::DoWrite(ConstByteSpan) {
-  // TODO(pwbug/421): To implement
+  // TODO(b/235291139): To implement
   return PW_STATUS_UNIMPLEMENTED;
 }
 
diff --git a/pw_tls_client_mbedtls/BUILD.bazel b/pw_tls_client_mbedtls/BUILD.bazel
index e376115..dd0e094 100644
--- a/pw_tls_client_mbedtls/BUILD.bazel
+++ b/pw_tls_client_mbedtls/BUILD.bazel
@@ -22,7 +22,7 @@
 
 licenses(["notice"])
 
-# TODO(pwbug/398): The recipe is under construction.
+# TODO(b/235289501): The recipe is under construction.
 
 pw_cc_library(
     name = "pw_tls_client_mbedtls",
diff --git a/pw_tls_client_mbedtls/tls_client_mbedtls.cc b/pw_tls_client_mbedtls/tls_client_mbedtls.cc
index dc01c22..9341dc0 100644
--- a/pw_tls_client_mbedtls/tls_client_mbedtls.cc
+++ b/pw_tls_client_mbedtls/tls_client_mbedtls.cc
@@ -145,7 +145,7 @@
   // The API does not fail.
   mbedtls_ssl_conf_authmode(&ssl_config_, MBEDTLS_SSL_VERIFY_REQUIRED);
 
-  // TODO(pwbug/398): Add logic for loading trust anchors.
+  // TODO(b/235289501): Add logic for loading trust anchors.
 
   // Load configuration to SSL.
   ret = mbedtls_ssl_setup(&ssl_ctx_, &ssl_config_);
@@ -187,7 +187,7 @@
   auto setup_status = sess->session_impl_.Setup();
   if (!setup_status.ok()) {
     PW_LOG_DEBUG("Failed to setup");
-    // TODO(pwbug/398): `tls_status_` may be set, but the session object will
+    // TODO(b/235289501): `tls_status_` may be set, but the session object will
     // be released. Map `tls_stauts_` to string and print out here so that
     // the information can be catched.
     delete sess;
@@ -198,22 +198,22 @@
 }
 
 Status Session::Open() {
-  // TODO(pwbug/398): To implement
+  // TODO(b/235289501): To implement
   return Status::Unimplemented();
 }
 
 Status Session::Close() {
-  // TODO(pwbug/398): To implement
+  // TODO(b/235289501): To implement
   return Status::Unimplemented();
 }
 
 StatusWithSize Session::DoRead(ByteSpan) {
-  // TODO(pwbug/398): To implement
+  // TODO(b/235289501): To implement
   return StatusWithSize(Status::Unimplemented(), 0);
 }
 
 Status Session::DoWrite(ConstByteSpan) {
-  // TODO(pwbug/398): To implement
+  // TODO(b/235289501): To implement
   return Status::Unimplemented();
 }