diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
index 80d251bc06d5..0c528487d39a 100644
--- a/browser/components/BrowserGlue.sys.mjs
+++ b/browser/components/BrowserGlue.sys.mjs
@@ -34,7 +34,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
   DAPTelemetrySender: "resource://gre/modules/DAPTelemetrySender.sys.mjs",
   DAPVisitCounter: "resource://gre/modules/DAPVisitCounter.sys.mjs",
   Discovery: "resource:///modules/Discovery.sys.mjs",
-  DoHController: "resource://gre/modules/DoHController.sys.mjs",
+  DoHController: "resource:///modules/DoHController.sys.mjs",
   DownloadsViewableInternally:
     "resource:///modules/DownloadsViewableInternally.sys.mjs",
   ExtensionsUI: "resource:///modules/ExtensionsUI.sys.mjs",
diff --git a/toolkit/components/doh/DoHConfig.sys.mjs b/browser/components/doh/DoHConfig.sys.mjs
similarity index 94%
rename from toolkit/components/doh/DoHConfig.sys.mjs
rename to browser/components/doh/DoHConfig.sys.mjs
index f0d8e631a2fb..4eb82546119b 100644
--- a/toolkit/components/doh/DoHConfig.sys.mjs
+++ b/browser/components/doh/DoHConfig.sys.mjs
@@ -262,22 +262,20 @@ export const DoHConfigController = {
   observe(subject, topic, data) {
     switch (topic) {
       case kPrefChangedTopic:
-        {
-          let allowedPrefs = Object.getOwnPropertyNames(kConfigPrefs).map(
-            k => kConfigPrefs[k]
-          );
-          if (
-            !allowedPrefs.some(pref =>
-              [
-                `${regionPrefBranch()}.${pref}`,
-                `${kGlobalPrefBranch}.${pref}`,
-              ].includes(data)
-            )
-          ) {
-            break;
-          }
-          this.notifyNewConfig();
+        let allowedPrefs = Object.getOwnPropertyNames(kConfigPrefs).map(
+          k => kConfigPrefs[k]
+        );
+        if (
+          !allowedPrefs.some(pref =>
+            [
+              `${regionPrefBranch()}.${pref}`,
+              `${kGlobalPrefBranch}.${pref}`,
+            ].includes(data)
+          )
+        ) {
+          break;
         }
+        this.notifyNewConfig();
         break;
       case "idle-daily":
         if (
@@ -333,11 +331,7 @@ export const DoHConfigController = {
       return;
     }
 
-    let isAndroid = Services.appinfo.OS === "Android";
-    if (
-      (isAndroid && localConfig.androidRolloutEnabled) ||
-      (!isAndroid && localConfig.rolloutEnabled)
-    ) {
+    if (localConfig.rolloutEnabled) {
       newConfig.enabled = true;
     }
 
diff --git a/toolkit/components/doh/DoHController.sys.mjs b/browser/components/doh/DoHController.sys.mjs
similarity index 99%
rename from toolkit/components/doh/DoHController.sys.mjs
rename to browser/components/doh/DoHController.sys.mjs
index 017de747c843..2892ffd91e9b 100644
--- a/toolkit/components/doh/DoHController.sys.mjs
+++ b/browser/components/doh/DoHController.sys.mjs
@@ -14,9 +14,9 @@ const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {
   AsyncShutdown: "resource://gre/modules/AsyncShutdown.sys.mjs",
   ClientID: "resource://gre/modules/ClientID.sys.mjs",
-  DoHConfigController: "resource://gre/modules/DoHConfig.sys.mjs",
+  DoHConfigController: "resource:///modules/DoHConfig.sys.mjs",
   ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
-  Heuristics: "resource://gre/modules/DoHHeuristics.sys.mjs",
+  Heuristics: "resource:///modules/DoHHeuristics.sys.mjs",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
   Preferences: "resource://gre/modules/Preferences.sys.mjs",
   clearTimeout: "resource://gre/modules/Timer.sys.mjs",
@@ -589,7 +589,7 @@ export const DoHController = {
     // Importing the module here saves us from having to do it at startup, and
     // ensures tests have time to set prefs before the module initializes.
     let { TRRRacer } = ChromeUtils.importESModule(
-      "resource://gre/modules/TRRPerformance.sys.mjs"
+      "resource:///modules/TRRPerformance.sys.mjs"
     );
     await new Promise(resolve => {
       let trrList =
diff --git a/toolkit/components/doh/DoHHeuristics.sys.mjs b/browser/components/doh/DoHHeuristics.sys.mjs
similarity index 98%
rename from toolkit/components/doh/DoHHeuristics.sys.mjs
rename to browser/components/doh/DoHHeuristics.sys.mjs
index fd39a9be17c2..ecbc0f5b7794 100644
--- a/toolkit/components/doh/DoHHeuristics.sys.mjs
+++ b/browser/components/doh/DoHHeuristics.sys.mjs
@@ -26,7 +26,7 @@ XPCOMUtils.defineLazyServiceGetter(
 );
 
 ChromeUtils.defineESModuleGetters(lazy, {
-  DoHConfigController: "resource://gre/modules/DoHConfig.sys.mjs",
+  DoHConfigController: "resource:///modules/DoHConfig.sys.mjs",
 });
 
 const GLOBAL_CANARY = "use-application-dns.net.";
@@ -279,10 +279,6 @@ async function thirdPartyRoots() {
 }
 
 async function enterprisePolicy() {
-  if (!Services.policies) {
-    return "no_policy_set";
-  }
-
   if (Services.policies.status === Services.policies.ACTIVE) {
     let policies = Services.policies.getActivePolicies();
 
diff --git a/toolkit/components/doh/DoHTestUtils.sys.mjs b/browser/components/doh/DoHTestUtils.sys.mjs
similarity index 100%
rename from toolkit/components/doh/DoHTestUtils.sys.mjs
rename to browser/components/doh/DoHTestUtils.sys.mjs
diff --git a/toolkit/components/doh/TRRPerformance.sys.mjs b/browser/components/doh/TRRPerformance.sys.mjs
similarity index 99%
rename from toolkit/components/doh/TRRPerformance.sys.mjs
rename to browser/components/doh/TRRPerformance.sys.mjs
index ac18209606f9..370a94471bdc 100644
--- a/toolkit/components/doh/TRRPerformance.sys.mjs
+++ b/browser/components/doh/TRRPerformance.sys.mjs
@@ -77,9 +77,6 @@ function getRandomSubdomain() {
 // callback. The wrapper attempts the lookup 3 times before passing on a failure.
 // If a false-y `domain` is supplied, a random subdomain will be used. Each retry
 // will use a different random subdomain to ensure we bypass chached responses.
-/**
- *
- */
 export class DNSLookup {
   constructor(domain, trrServer, callback) {
     this._domain = domain;
@@ -123,9 +120,6 @@ DNSLookup.prototype.QueryInterface = ChromeUtils.generateQI(["nsIDNSListener"]);
 // A wrapper around a single set of measurements. The required lookups are
 // triggered and the results aggregated before telemetry is sent. If aborted,
 // any aggregated results are discarded.
-/**
- *
- */
 export class LookupAggregator {
   constructor(onCompleteCallback, trrList) {
     this.onCompleteCallback = onCompleteCallback;
@@ -227,9 +221,6 @@ export class LookupAggregator {
 // When the network goes down, an ongoing aggregator is aborted and a new one
 // spawned next time we get a link, up to 5 times. On the fifth time, we just
 // let the aggegator complete and mark it as tainted.
-/**
- *
- */
 export class TRRRacer {
   constructor(onCompleteCallback, trrList) {
     this._aggregator = null;
diff --git a/toolkit/components/doh/metrics.yaml b/browser/components/doh/metrics.yaml
similarity index 100%
rename from toolkit/components/doh/metrics.yaml
rename to browser/components/doh/metrics.yaml
diff --git a/toolkit/components/doh/moz.build b/browser/components/doh/moz.build
similarity index 92%
rename from toolkit/components/doh/moz.build
rename to browser/components/doh/moz.build
index 3dbc9ac21711..05030b09ab76 100644
--- a/toolkit/components/doh/moz.build
+++ b/browser/components/doh/moz.build
@@ -5,7 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files("**"):
-    BUG_COMPONENT = ("Core", "Networking: DNS")
+    BUG_COMPONENT = ("Firefox", "Security")
 
 EXTRA_JS_MODULES += [
     "DoHConfig.sys.mjs",
diff --git a/toolkit/components/doh/test/browser/browser.toml b/browser/components/doh/test/browser/browser.toml
similarity index 86%
rename from toolkit/components/doh/test/browser/browser.toml
rename to browser/components/doh/test/browser/browser.toml
index 5124955ef165..a8df8bea0c79 100644
--- a/toolkit/components/doh/test/browser/browser.toml
+++ b/browser/components/doh/test/browser/browser.toml
@@ -1,6 +1,5 @@
 [DEFAULT]
 head = "head.js"
-skip-if = ["os == 'android'"] # browser-chrome tests don't work on android
 
 ["browser_cleanFlow.js"]
 
diff --git a/toolkit/components/doh/test/browser/browser_cleanFlow.js b/browser/components/doh/test/browser/browser_cleanFlow.js
similarity index 100%
rename from toolkit/components/doh/test/browser/browser_cleanFlow.js
rename to browser/components/doh/test/browser/browser_cleanFlow.js
diff --git a/toolkit/components/doh/test/browser/browser_dirtyEnable.js b/browser/components/doh/test/browser/browser_dirtyEnable.js
similarity index 100%
rename from toolkit/components/doh/test/browser/browser_dirtyEnable.js
rename to browser/components/doh/test/browser/browser_dirtyEnable.js
diff --git a/toolkit/components/doh/test/browser/browser_doh_region.js b/browser/components/doh/test/browser/browser_doh_region.js
similarity index 100%
rename from toolkit/components/doh/test/browser/browser_doh_region.js
rename to browser/components/doh/test/browser/browser_doh_region.js
diff --git a/toolkit/components/doh/test/browser/browser_doorhangerUserReject.js b/browser/components/doh/test/browser/browser_doorhangerUserReject.js
similarity index 100%
rename from toolkit/components/doh/test/browser/browser_doorhangerUserReject.js
rename to browser/components/doh/test/browser/browser_doorhangerUserReject.js
diff --git a/toolkit/components/doh/test/browser/browser_platformDetection.js b/browser/components/doh/test/browser/browser_platformDetection.js
similarity index 98%
rename from toolkit/components/doh/test/browser/browser_platformDetection.js
rename to browser/components/doh/test/browser/browser_platformDetection.js
index 4d7dd6f64320..025546ae9ec5 100644
--- a/toolkit/components/doh/test/browser/browser_platformDetection.js
+++ b/browser/components/doh/test/browser/browser_platformDetection.js
@@ -5,7 +5,7 @@
 "use strict";
 
 ChromeUtils.defineESModuleGetters(this, {
-  Heuristics: "resource://gre/modules/DoHHeuristics.sys.mjs",
+  Heuristics: "resource:///modules/DoHHeuristics.sys.mjs",
 });
 
 add_task(setup);
diff --git a/toolkit/components/doh/test/browser/browser_policyOverride.js b/browser/components/doh/test/browser/browser_policyOverride.js
similarity index 100%
rename from toolkit/components/doh/test/browser/browser_policyOverride.js
rename to browser/components/doh/test/browser/browser_policyOverride.js
diff --git a/toolkit/components/doh/test/browser/browser_providerSteering.js b/browser/components/doh/test/browser/browser_providerSteering.js
similarity index 100%
rename from toolkit/components/doh/test/browser/browser_providerSteering.js
rename to browser/components/doh/test/browser/browser_providerSteering.js
diff --git a/toolkit/components/doh/test/browser/browser_remoteSettings_newProfile.js b/browser/components/doh/test/browser/browser_remoteSettings_newProfile.js
similarity index 100%
rename from toolkit/components/doh/test/browser/browser_remoteSettings_newProfile.js
rename to browser/components/doh/test/browser/browser_remoteSettings_newProfile.js
diff --git a/toolkit/components/doh/test/browser/browser_remoteSettings_rollout.js b/browser/components/doh/test/browser/browser_remoteSettings_rollout.js
similarity index 100%
rename from toolkit/components/doh/test/browser/browser_remoteSettings_rollout.js
rename to browser/components/doh/test/browser/browser_remoteSettings_rollout.js
diff --git a/toolkit/components/doh/test/browser/browser_rollback.js b/browser/components/doh/test/browser/browser_rollback.js
similarity index 100%
rename from toolkit/components/doh/test/browser/browser_rollback.js
rename to browser/components/doh/test/browser/browser_rollback.js
diff --git a/toolkit/components/doh/test/browser/browser_throttle_heuristics.js b/browser/components/doh/test/browser/browser_throttle_heuristics.js
similarity index 100%
rename from toolkit/components/doh/test/browser/browser_throttle_heuristics.js
rename to browser/components/doh/test/browser/browser_throttle_heuristics.js
diff --git a/toolkit/components/doh/test/browser/browser_trrSelect.js b/browser/components/doh/test/browser/browser_trrSelect.js
similarity index 100%
rename from toolkit/components/doh/test/browser/browser_trrSelect.js
rename to browser/components/doh/test/browser/browser_trrSelect.js
diff --git a/toolkit/components/doh/test/browser/browser_trrSelection_disable.js b/browser/components/doh/test/browser/browser_trrSelection_disable.js
similarity index 100%
rename from toolkit/components/doh/test/browser/browser_trrSelection_disable.js
rename to browser/components/doh/test/browser/browser_trrSelection_disable.js
diff --git a/toolkit/components/doh/test/browser/browser_userInterference.js b/browser/components/doh/test/browser/browser_userInterference.js
similarity index 100%
rename from toolkit/components/doh/test/browser/browser_userInterference.js
rename to browser/components/doh/test/browser/browser_userInterference.js
diff --git a/toolkit/components/doh/test/browser/head.js b/browser/components/doh/test/browser/head.js
similarity index 98%
rename from toolkit/components/doh/test/browser/head.js
rename to browser/components/doh/test/browser/head.js
index 53c56d1750d2..236680d8d09d 100644
--- a/toolkit/components/doh/test/browser/head.js
+++ b/browser/components/doh/test/browser/head.js
@@ -2,10 +2,10 @@
 
 ChromeUtils.defineESModuleGetters(this, {
   ASRouter: "resource:///modules/asrouter/ASRouter.sys.mjs",
-  DoHConfigController: "resource://gre/modules/DoHConfig.sys.mjs",
-  DoHController: "resource://gre/modules/DoHController.sys.mjs",
+  DoHConfigController: "resource:///modules/DoHConfig.sys.mjs",
+  DoHController: "resource:///modules/DoHController.sys.mjs",
   DoHTestUtils: "resource://testing-common/DoHTestUtils.sys.mjs",
-  Heuristics: "resource://gre/modules/DoHHeuristics.sys.mjs",
+  Heuristics: "resource:///modules/DoHHeuristics.sys.mjs",
   Preferences: "resource://gre/modules/Preferences.sys.mjs",
   Region: "resource://gre/modules/Region.sys.mjs",
   RegionTestUtils: "resource://testing-common/RegionTestUtils.sys.mjs",
diff --git a/toolkit/components/doh/test/unit/head.js b/browser/components/doh/test/unit/head.js
similarity index 98%
rename from toolkit/components/doh/test/unit/head.js
rename to browser/components/doh/test/unit/head.js
index 7071c2f8390a..3c8010cba3c0 100644
--- a/toolkit/components/doh/test/unit/head.js
+++ b/browser/components/doh/test/unit/head.js
@@ -80,7 +80,7 @@ function setup() {
   );
 
   let TRRPerformance = ChromeUtils.importESModule(
-    "resource://gre/modules/TRRPerformance.sys.mjs"
+    "resource:///modules/TRRPerformance.sys.mjs"
   );
 
   DNSLookup = TRRPerformance.DNSLookup;
diff --git a/toolkit/components/doh/test/unit/test_DNSLookup.js b/browser/components/doh/test/unit/test_DNSLookup.js
similarity index 100%
rename from toolkit/components/doh/test/unit/test_DNSLookup.js
rename to browser/components/doh/test/unit/test_DNSLookup.js
diff --git a/toolkit/components/doh/test/unit/test_LookupAggregator.js b/browser/components/doh/test/unit/test_LookupAggregator.js
similarity index 88%
rename from toolkit/components/doh/test/unit/test_LookupAggregator.js
rename to browser/components/doh/test/unit/test_LookupAggregator.js
index 269d4d194187..e63920ee351d 100644
--- a/toolkit/components/doh/test/unit/test_LookupAggregator.js
+++ b/browser/components/doh/test/unit/test_LookupAggregator.js
@@ -14,7 +14,6 @@ async function helper_SuccessfulLookupAggregator(
   networkUnstable = false,
   captivePortal = false
 ) {
-  Services.fog.testResetFOG();
   let deferred = Promise.withResolvers();
   let aggregator = new LookupAggregator(() => deferred.resolve(), trrList);
   // The aggregator's domain list should correctly reflect our set
@@ -39,23 +38,24 @@ async function helper_SuccessfulLookupAggregator(
   Assert.equal(aggregator.captivePortal, captivePortal);
   Assert.equal(aggregator.results.length, aggregator.totalLookups);
 
-  let events =
-    await Glean.securityDohTrrPerformance.resolvedRecord.testGetValue();
+  let events = Services.telemetry.snapshotEvents(
+    Ci.nsITelemetry.DATASET_PRERELEASE_CHANNELS,
+    true
+  ).parent;
   Assert.ok(events);
-  info(events);
-
-  events = events.filter(e => e.category == "security.doh.trr_performance");
+  events = events.filter(e => e[1] == "security.doh.trrPerformance");
   Assert.equal(events.length, aggregator.totalLookups);
 
   for (let event of events) {
     info(JSON.stringify(event));
-    Assert.equal(event.category, "security.doh.trr_performance");
-    Assert.equal(event.name, "resolved_record");
-    Assert.equal(event.extra.value, "success");
+    Assert.equal(event[1], "security.doh.trrPerformance");
+    Assert.equal(event[2], "resolved");
+    Assert.equal(event[3], "record");
+    Assert.equal(event[4], "success");
   }
 
   // We only need to check the payload of each event from here on.
-  events = events.map(e => e.extra);
+  events = events.map(e => e[5]);
 
   for (let trr of [trrServer1, trrServer2]) {
     // There should be two results for random subdomains.
@@ -114,7 +114,7 @@ async function helper_SuccessfulLookupAggregator(
     }
   }
 
-  Services.fog.testResetFOG();
+  Services.telemetry.clearEvents();
 }
 
 add_task(async function test_SuccessfulLookupAggregator() {
@@ -125,7 +125,6 @@ add_task(async function test_SuccessfulLookupAggregator() {
 });
 
 add_task(async function test_AbortedLookupAggregator() {
-  Services.fog.testResetFOG();
   let deferred = Promise.withResolvers();
   let aggregator = new LookupAggregator(() => deferred.resolve(), trrList);
   // The aggregator's domain list should correctly reflect our set
@@ -153,7 +152,11 @@ add_task(async function test_AbortedLookupAggregator() {
   Assert.ok(!aggregator.captivePortal);
 
   // Ensure we send no telemetry for an aborted run!
-  let events =
-    await Glean.securityDohTrrPerformance.resolvedRecord.testGetValue();
-  Assert.ok(!events || !events.length);
+  let events = Services.telemetry.snapshotEvents(
+    Ci.nsITelemetry.DATASET_PRERELEASE_CHANNELS,
+    true
+  ).parent;
+  Assert.ok(
+    !events || !events.filter(e => e[1] == "security.doh.trrPerformance").length
+  );
 });
diff --git a/toolkit/components/doh/test/unit/test_TRRRacer.js b/browser/components/doh/test/unit/test_TRRRacer.js
similarity index 88%
rename from toolkit/components/doh/test/unit/test_TRRRacer.js
rename to browser/components/doh/test/unit/test_TRRRacer.js
index 0e7a0664f8e9..9ad38f3981ab 100644
--- a/toolkit/components/doh/test/unit/test_TRRRacer.js
+++ b/browser/components/doh/test/unit/test_TRRRacer.js
@@ -7,7 +7,6 @@
 add_task(setup);
 
 add_task(async function test_TRRRacer_cleanRun() {
-  Services.fog.testResetFOG();
   let deferred = Promise.withResolvers();
   let racer = new TRRRacer(() => {
     deferred.resolve();
@@ -18,12 +17,15 @@ add_task(async function test_TRRRacer_cleanRun() {
   await deferred.promise;
   Assert.equal(racer._retryCount, 1);
 
-  let events =
-    await Glean.securityDohTrrPerformance.resolvedRecord.testGetValue();
-  events = events.filter(e => e.category == "security.doh.trr_performance");
+  let events = Services.telemetry.snapshotEvents(
+    Ci.nsITelemetry.DATASET_PRERELEASE_CHANNELS,
+    true
+  ).parent;
+  Assert.ok(events);
+  events = events.filter(e => e[1] == "security.doh.trrPerformance");
   Assert.equal(events.length, racer._aggregator.totalLookups);
 
-  Services.fog.testResetFOG();
+  Services.telemetry.clearEvents();
 
   // Simulate network changes and ensure no re-runs since it's already complete.
   async function testNetworkChange(captivePortal = false) {
@@ -54,7 +56,6 @@ add_task(async function test_TRRRacer_cleanRun() {
 });
 
 async function test_TRRRacer_networkFlux_helper(captivePortal = false) {
-  Services.fog.testResetFOG();
   let deferred = Promise.withResolvers();
   let racer = new TRRRacer(() => {
     deferred.resolve();
@@ -84,12 +85,15 @@ async function test_TRRRacer_networkFlux_helper(captivePortal = false) {
 
   Assert.equal(racer._retryCount, 2);
 
-  let events =
-    await Glean.securityDohTrrPerformance.resolvedRecord.testGetValue();
-  events = events.filter(e => e.category == "security.doh.trr_performance");
+  let events = Services.telemetry.snapshotEvents(
+    Ci.nsITelemetry.DATASET_PRERELEASE_CHANNELS,
+    true
+  ).parent;
+  Assert.ok(events);
+  events = events.filter(e => e[1] == "security.doh.trrPerformance");
   Assert.equal(events.length, racer._aggregator.totalLookups);
 
-  Services.fog.testResetFOG();
+  Services.telemetry.clearEvents();
   if (captivePortal) {
     Services.obs.notifyObservers(null, "captive-portal-login-abort");
   }
@@ -141,12 +145,15 @@ async function test_TRRRacer_maxRetries_helper(captivePortal = false) {
   await deferred.promise;
   Assert.equal(racer._retryCount, 5);
 
-  let events =
-    await Glean.securityDohTrrPerformance.resolvedRecord.testGetValue();
-  events = events.filter(e => e.category == "security.doh.trr_performance");
+  let events = Services.telemetry.snapshotEvents(
+    Ci.nsITelemetry.DATASET_PRERELEASE_CHANNELS,
+    true
+  ).parent;
+  Assert.ok(events);
+  events = events.filter(e => e[1] == "security.doh.trrPerformance");
   Assert.equal(events.length, racer._aggregator.totalLookups);
 
-  Services.fog.testResetFOG();
+  Services.telemetry.clearEvents();
   if (captivePortal) {
     Services.obs.notifyObservers(null, "captive-portal-login-abort");
   }
diff --git a/toolkit/components/doh/test/unit/test_heuristics.js b/browser/components/doh/test/unit/test_heuristics.js
similarity index 97%
rename from toolkit/components/doh/test/unit/test_heuristics.js
rename to browser/components/doh/test/unit/test_heuristics.js
index cc487b462722..a6a6c9b6c9c4 100644
--- a/toolkit/components/doh/test/unit/test_heuristics.js
+++ b/browser/components/doh/test/unit/test_heuristics.js
@@ -35,7 +35,7 @@ add_task(setup);
 
 add_task(async function test_parentalControls() {
   let DoHHeuristics = ChromeUtils.importESModule(
-    "resource://gre/modules/DoHHeuristics.sys.mjs"
+    "resource:///modules/DoHHeuristics.sys.mjs"
   );
 
   let parentalControls = DoHHeuristics.parentalControls;
diff --git a/toolkit/components/doh/test/unit/xpcshell.toml b/browser/components/doh/test/unit/xpcshell.toml
similarity index 85%
rename from toolkit/components/doh/test/unit/xpcshell.toml
rename to browser/components/doh/test/unit/xpcshell.toml
index 0017dc5b0d9a..9d40b7462104 100644
--- a/toolkit/components/doh/test/unit/xpcshell.toml
+++ b/browser/components/doh/test/unit/xpcshell.toml
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = ["os == 'android'"] # bug 1730213
 head = "head.js"
 firefox-appdir = "browser"
 support-files = ["../../../../../netwerk/test/unit/http2-ca.pem"]
diff --git a/browser/components/moz.build b/browser/components/moz.build
index 612d2f33b927..72c51892f5b9 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -36,6 +36,7 @@ DIRS += [
     "contentanalysis",
     "contextualidentity",
     "customizableui",
+    "doh",
     "downloads",
     "enterprisepolicies",
     "extensions",
diff --git a/browser/components/preferences/privacy.js b/browser/components/preferences/privacy.js
index 61bc0748399c..6b4ec7ab4e68 100644
--- a/browser/components/preferences/privacy.js
+++ b/browser/components/preferences/privacy.js
@@ -76,7 +76,7 @@ XPCOMUtils.defineLazyPreferenceGetter(
 );
 
 ChromeUtils.defineESModuleGetters(this, {
-  DoHConfigController: "resource://gre/modules/DoHConfig.sys.mjs",
+  DoHConfigController: "resource:///modules/DoHConfig.sys.mjs",
   Sanitizer: "resource:///modules/Sanitizer.sys.mjs",
   SelectableProfileService:
     "resource:///modules/profiles/SelectableProfileService.sys.mjs",
diff --git a/browser/components/preferences/tests/browser_privacy_dnsoverhttps.js b/browser/components/preferences/tests/browser_privacy_dnsoverhttps.js
index 40f839b169ae..1498541fbd16 100644
--- a/browser/components/preferences/tests/browser_privacy_dnsoverhttps.js
+++ b/browser/components/preferences/tests/browser_privacy_dnsoverhttps.js
@@ -11,8 +11,8 @@ const { EnterprisePolicyTesting, PoliciesPrefTracker } =
   );
 
 ChromeUtils.defineESModuleGetters(this, {
-  DoHConfigController: "resource://gre/modules/DoHConfig.sys.mjs",
-  DoHController: "resource://gre/modules/DoHController.sys.mjs",
+  DoHConfigController: "resource:///modules/DoHConfig.sys.mjs",
+  DoHController: "resource:///modules/DoHController.sys.mjs",
   DoHTestUtils: "resource://testing-common/DoHTestUtils.sys.mjs",
 });
 
diff --git a/mobile/shared/components/geckoview/GeckoViewStartup.sys.mjs b/mobile/shared/components/geckoview/GeckoViewStartup.sys.mjs
index d3fb71c91b83..4483941f8e5e 100644
--- a/mobile/shared/components/geckoview/GeckoViewStartup.sys.mjs
+++ b/mobile/shared/components/geckoview/GeckoViewStartup.sys.mjs
@@ -9,7 +9,6 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   ActorManagerParent: "resource://gre/modules/ActorManagerParent.sys.mjs",
-  DoHController: "resource://gre/modules/DoHController.sys.mjs",
   EventDispatcher: "resource://gre/modules/Messaging.sys.mjs",
   PdfJs: "resource://pdf.js/PdfJs.sys.mjs",
 });
@@ -273,8 +272,6 @@ export class GeckoViewStartup {
         // Notify the start up crash tracker that the browser has successfully
         // started up so the startup cache isn't rebuilt on next startup.
         Services.startup.trackStartupCrashEnd();
-
-        lazy.DoHController.init();
         break;
       }
       case "handlersvc-store-initialized": {
diff --git a/services/settings/static-dumps/main/moz.build b/services/settings/static-dumps/main/moz.build
index 239377a77d72..de7b915d833e 100644
--- a/services/settings/static-dumps/main/moz.build
+++ b/services/settings/static-dumps/main/moz.build
@@ -2,7 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-FINAL_TARGET_FILES.defaults.settings.main += [
-    "doh-config.json",
-    "doh-providers.json",
-]
+if CONFIG["MOZ_BUILD_APP"] == "browser":
+    DIST_SUBDIR = "browser"
+
+    # These collections are only referenced from browser/
+    FINAL_TARGET_FILES.defaults.settings.main += [
+        "doh-config.json",
+        "doh-providers.json",
+    ]
diff --git a/toolkit/components/glean/metrics_index.py b/toolkit/components/glean/metrics_index.py
index 8a7e56e7abb8..f7fa5571ac2c 100644
--- a/toolkit/components/glean/metrics_index.py
+++ b/toolkit/components/glean/metrics_index.py
@@ -70,7 +70,6 @@ gecko_metrics = [
     "toolkit/components/antitracking/metrics.yaml",
     "toolkit/components/captchadetection/metrics.yaml",
     "toolkit/components/cookiebanners/metrics.yaml",
-    "toolkit/components/doh/metrics.yaml",
     "toolkit/components/downloads/metrics.yaml",
     "toolkit/components/enterprisepolicies/metrics.yaml",
     "toolkit/components/extensions/metrics.yaml",
@@ -110,6 +109,7 @@ firefox_desktop_metrics = [
     "browser/actors/metrics.yaml",
     "browser/components/asrouter/metrics.yaml",
     "browser/components/backup/metrics.yaml",
+    "browser/components/doh/metrics.yaml",
     "browser/components/downloads/metrics.yaml",
     "browser/components/firefoxview/metrics.yaml",
     "browser/components/genai/metrics.yaml",
diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index 55de5c50a1dc..98c335b9dbad 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -39,7 +39,6 @@ DIRS += [
     "crashes",
     "crashmonitor",
     "credentialmanagement",
-    "doh",
     "downloads",
     "enterprisepolicies",
     "extensions",