diff --git a/AUTHORS b/AUTHORS
index c569ade108..6d1ee96145 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,7 +4,6 @@
 Alexander Brauckmann <a.brauckmann@gmail.com>
 Andrew MacDonald <andrew@webrtc.org>
 Anil Kumar <an1kumar@gmail.com>
-Arlo Breault <arlolra@gmail.com>
 Ben Strong <bstrong@gmail.com>
 Bob Withers <bwit@pobox.com>
 Bridger Maxwell <bridgeyman@gmail.com>
diff --git a/webrtc/api/BUILD.gn b/webrtc/api/BUILD.gn
index 6b7c5f98c5..a8e27d6aa6 100644
--- a/webrtc/api/BUILD.gn
+++ b/webrtc/api/BUILD.gn
@@ -113,7 +113,6 @@ source_set("libjingle_peerconnection") {
     "../call",
     "../media",
     "../pc",
-    "../system_wrappers:field_trial_default",
   ]
 
   if (rtc_use_quic) {
@@ -199,6 +198,7 @@ if (is_android && !build_with_chromium) {
 
     deps = [
       ":libjingle_peerconnection",
+      "../system_wrappers:field_trial_default",
       "../system_wrappers:metrics_default",
     ]
 
diff --git a/webrtc/api/api.gyp b/webrtc/api/api.gyp
index e6fa0c4e39..86a55fd9d2 100644
--- a/webrtc/api/api.gyp
+++ b/webrtc/api/api.gyp
@@ -30,6 +30,7 @@
           'target_name': 'libjingle_peerconnection_jni',
           'type': 'static_library',
           'dependencies': [
+            '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:metrics_default',
             'libjingle_peerconnection',
           ],
@@ -103,7 +104,6 @@
       'dependencies': [
         '<(webrtc_root)/media/media.gyp:rtc_media',
         '<(webrtc_root)/pc/pc.gyp:rtc_pc',
-        '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
       ],
       'sources': [
         'audiotrack.cc',