diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn
index c6ef83899c..f837cad93b 100644
--- a/modules/congestion_controller/goog_cc/BUILD.gn
+++ b/modules/congestion_controller/goog_cc/BUILD.gn
@@ -41,7 +41,8 @@ rtc_static_library("goog_cc") {
     "../../../logging:rtc_event_log_api",
     "../../../logging:rtc_event_pacing",
     "../../../rtc_base:checks",
-    "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:logging",
+    "../../../rtc_base:macromagic",
     "../../../rtc_base/experiments:alr_experiment",
     "../../../rtc_base/experiments:field_trial_parser",
     "../../../rtc_base/experiments:rate_control_settings",
@@ -76,7 +77,6 @@ rtc_source_set("pushback_controller") {
     "../../../api/transport:webrtc_key_value_config",
     "../../../api/units:data_size",
     "../../../rtc_base:checks",
-    "../../../rtc_base:rtc_base_approved",
     "../../../rtc_base/experiments:rate_control_settings",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
@@ -93,7 +93,7 @@ rtc_source_set("alr_detector") {
     "../../../logging:rtc_event_log_api",
     "../../../logging:rtc_event_pacing",
     "../../../rtc_base:checks",
-    "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:safe_conversions",
     "../../../rtc_base/experiments:alr_experiment",
     "../../pacing:interval_budget",
     "//third_party/abseil-cpp/absl/memory",
@@ -122,8 +122,10 @@ rtc_source_set("estimators") {
     "../../../logging:rtc_event_bwe",
     "../../../logging:rtc_event_log_api",
     "../../../rtc_base:checks",
-    "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:logging",
+    "../../../rtc_base:macromagic",
     "../../../rtc_base:rtc_numerics",
+    "../../../rtc_base:safe_conversions",
     "../../../rtc_base:safe_minmax",
     "../../../rtc_base/experiments:field_trial_parser",
     "../../remote_bitrate_estimator",
@@ -174,7 +176,9 @@ rtc_source_set("probe_controller") {
     "../../../logging:rtc_event_log_api",
     "../../../logging:rtc_event_pacing",
     "../../../rtc_base:checks",
-    "../../../rtc_base:rtc_base_approved",
+    "../../../rtc_base:logging",
+    "../../../rtc_base:macromagic",
+    "../../../rtc_base:safe_conversions",
     "../../../rtc_base/system:unused",
     "../../../system_wrappers:metrics",
     "//third_party/abseil-cpp/absl/memory:memory",
diff --git a/modules/congestion_controller/goog_cc/alr_detector.cc b/modules/congestion_controller/goog_cc/alr_detector.cc
index 3009de44fd..9ff40779a1 100644
--- a/modules/congestion_controller/goog_cc/alr_detector.cc
+++ b/modules/congestion_controller/goog_cc/alr_detector.cc
@@ -20,7 +20,6 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/experiments/alr_experiment.h"
 #include "rtc_base/numerics/safe_conversions.h"
-#include "rtc_base/time_utils.h"
 
 namespace webrtc {
 AlrDetector::AlrDetector() : AlrDetector(nullptr) {}
@@ -65,7 +64,7 @@ void AlrDetector::OnBytesSent(size_t bytes_sent, int64_t send_time_ms) {
   bool state_changed = false;
   if (alr_budget_.budget_level_percent() > alr_start_budget_level_percent_ &&
       !alr_started_time_ms_) {
-    alr_started_time_ms_.emplace(rtc::TimeMillis());
+    alr_started_time_ms_.emplace(send_time_ms);
     state_changed = true;
   } else if (alr_budget_.budget_level_percent() <
                  alr_stop_budget_level_percent_ &&