--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -1914,16 +1914,18 @@
     "kind": "exponential",
     "high": 30000,
     "n_buckets": 50,
     "description": "HTTP page channel: open() -> DNS request issued (ms)"
   },
   "HTTP_PAGE_DNS_LOOKUP_TIME": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
+    "alert_emails": ["necko@mozilla.com", "pmcmanus@mozilla.com"],
     "kind": "exponential",
     "high": 30000,
     "n_buckets": 50,
     "description": "HTTP page channel: DNS lookup time (ms)"
   },
   "HTTP_PAGE_TLS_HANDSHAKE": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
@@ -2025,16 +2027,18 @@
     "description": "HTTP subitem channel: open() -> DNS request issued (ms)"
   },
   "HTTP_SUB_DNS_LOOKUP_TIME": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 30000,
     "n_buckets": 50,
+    "releaseChannelCollection": "opt-out",
+    "alert_emails": ["necko@mozilla.com", "pmcmanus@mozilla.com"],
     "description": "HTTP subitem channel: DNS lookup time (ms)"
   },
   "HTTP_SUB_TLS_HANDSHAKE": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
     "alert_emails": ["necko@mozilla.com", "pmcmanus@mozilla.com"],
     "bug_numbers": [772589],
     "kind": "exponential",
@@ -2785,22 +2789,23 @@
     "alert_emails": ["necko@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 32,
     "description": "H2: goaway reason from peer from rfc 7540. 31 is none received."
   },
   "SPDY_CONTINUED_HEADERS": {
     "record_in_processes": ["main", "content"],
-    "expires_in_version": "59",
-    "alert_emails": ["necko@mozilla.com"],
+    "expires_in_version": "never",
+    "alert_emails": ["necko@mozilla.com", "pmcmanus@mozilla.com"],
     "bug_numbers": [1324855],
     "kind": "exponential",
     "high": 32000000,
     "n_buckets": 75,
+    "releaseChannelCollection": "opt-out",
     "description": "Size of continued H2 headers in bytes."
   },
   "HPACK_ELEMENTS_EVICTED_DECOMPRESSOR": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 256,
     "n_buckets": 50,
@@ -3637,31 +3642,35 @@
     "n_values": 3,
     "description": "I want to be tracked, I do NOT want to be tracked, DNT unset"
   },
   "DNS_LOOKUP_METHOD2": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 16,
+    "releaseChannelCollection": "opt-out",
+    "alert_emails": ["necko@mozilla.com", "pmcmanus@mozilla.com"],
     "description": "DNS Lookup Type (hit, renewal, negative-hit, literal, overflow, network-first, network-shared)"
   },
   "DNS_CLEANUP_AGE": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 1440,
     "n_buckets": 50,
     "description": "DNS Cache Entry Age at Removal Time (minutes)"
   },
   "DNS_LOOKUP_TIME": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 60000,
+    "releaseChannelCollection": "opt-out",
+    "alert_emails": ["necko@mozilla.com", "pmcmanus@mozilla.com"],
     "n_buckets": 50,
     "description": "Time for a successful DNS OS resolution (msec)"
   },
   "DNS_RENEWAL_TIME": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 60000,
@@ -3676,22 +3685,26 @@
     "n_buckets": 50,
     "description": "Time for a DNS OS resolution (msec) used to get TTL"
   },
   "DNS_FAILED_LOOKUP_TIME": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 60000,
+    "releaseChannelCollection": "opt-out",
+    "alert_emails": ["necko@mozilla.com", "pmcmanus@mozilla.com"],
     "n_buckets": 50,
     "description": "Time for an unsuccessful DNS OS resolution (msec)"
   },
   "DNS_BLACKLIST_COUNT": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
+    "releaseChannelCollection": "opt-out",
+    "alert_emails": ["necko@mozilla.com", "pmcmanus@mozilla.com"],
     "kind": "linear",
     "high": 21,
     "n_buckets": 20,
     "description": "The number of unusable addresses reported for each record"
   },
   "REFRESH_DRIVER_TICK" : {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",

--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -169,21 +169,17 @@
     "DEVTOOLS_WEBIDE_CONNECTION_TIME_SECONDS",
     "DEVTOOLS_WEBIDE_LOCAL_CONNECTION_RESULT",
     "DEVTOOLS_WEBIDE_OTHER_CONNECTION_RESULT",
     "DEVTOOLS_WEBIDE_REMOTE_CONNECTION_RESULT",
     "DEVTOOLS_WEBIDE_SIMULATOR_CONNECTION_RESULT",
     "DEVTOOLS_WEBIDE_TIME_ACTIVE_SECONDS",
     "DEVTOOLS_WEBIDE_USB_CONNECTION_RESULT",
     "DEVTOOLS_WEBIDE_WIFI_CONNECTION_RESULT",
-    "DNS_BLACKLIST_COUNT",
     "DNS_CLEANUP_AGE",
-    "DNS_FAILED_LOOKUP_TIME",
-    "DNS_LOOKUP_METHOD2",
-    "DNS_LOOKUP_TIME",
     "DNS_RENEWAL_TIME",
     "DNS_RENEWAL_TIME_FOR_TTL",
     "DNT_USAGE",
     "DWRITEFONT_DELAYEDINITFONTLIST_COLLECT",
     "DWRITEFONT_DELAYEDINITFONTLIST_COUNT",
     "DWRITEFONT_DELAYEDINITFONTLIST_TOTAL",
     "DWRITEFONT_INIT_PROBLEM",
     "E10S_BLOCKED_FROM_RUNNING",
@@ -262,34 +258,32 @@
     "HTTP_DISK_CACHE_OVERHEAD",
     "HTTP_KBREAD_PER_CONN",
     "HTTP_OFFLINE_CACHE_DOCUMENT_LOAD",
     "HTTP_PAGE_CACHE_READ_TIME_V2",
     "HTTP_PAGE_COMPLETE_LOAD_CACHED_V2",
     "HTTP_PAGE_COMPLETE_LOAD_NET_V2",
     "HTTP_PAGE_COMPLETE_LOAD_V2",
     "HTTP_PAGE_DNS_ISSUE_TIME",
-    "HTTP_PAGE_DNS_LOOKUP_TIME",
     "HTTP_PAGE_FIRST_SENT_TO_LAST_RECEIVED",
     "HTTP_PAGE_OPEN_TO_FIRST_FROM_CACHE_V2",
     "HTTP_PAGE_OPEN_TO_FIRST_RECEIVED",
     "HTTP_PAGE_OPEN_TO_FIRST_SENT",
     "HTTP_PAGE_REVALIDATION",
     "HTTP_PROXY_TYPE",
     "HTTP_REQUEST_PER_CONN",
     "HTTP_REQUEST_PER_PAGE",
     "HTTP_REQUEST_PER_PAGE_FROM_CACHE",
     "HTTP_SUBITEM_FIRST_BYTE_LATENCY_TIME",
     "HTTP_SUBITEM_OPEN_LATENCY_TIME",
     "HTTP_SUB_CACHE_READ_TIME_V2",
     "HTTP_SUB_COMPLETE_LOAD_CACHED_V2",
     "HTTP_SUB_COMPLETE_LOAD_NET_V2",
     "HTTP_SUB_COMPLETE_LOAD_V2",
     "HTTP_SUB_DNS_ISSUE_TIME",
-    "HTTP_SUB_DNS_LOOKUP_TIME",
     "HTTP_SUB_FIRST_SENT_TO_LAST_RECEIVED",
     "HTTP_SUB_OPEN_TO_FIRST_FROM_CACHE_V2",
     "HTTP_SUB_OPEN_TO_FIRST_RECEIVED",
     "HTTP_SUB_OPEN_TO_FIRST_SENT",
     "HTTP_SUB_REVALIDATION",
     "HTTP_TRANSACTION_USE_ALTSVC",
     "HTTP_TRANSACTION_USE_ALTSVC_OE",
     "INNERWINDOWS_WITH_MUTATION_LISTENERS",