--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3752,201 +3752,239 @@
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
     "description": "Time spent rasterizing each frame in milliseconds",
     "kind": "exponential",
     "high": 1000,
     "n_buckets": 50
   },
   "PREDICTOR_PREDICT_ATTEMPTS": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 1000000,
     "n_buckets": 50,
     "description": "Number of times nsINetworkPredictor::Predict is called and attempts to predict"
   },
   "PREDICTOR_LEARN_ATTEMPTS": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 1000000,
     "n_buckets": 50,
     "description": "Number of times nsINetworkPredictor::Learn is called and attempts to learn"
   },
   "PREDICTOR_PREDICT_FULL_QUEUE": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 60000,
     "n_buckets": 50,
     "description": "Number of times nsINetworkPredictor::Predict doesn't continue because the queue is full"
   },
   "PREDICTOR_LEARN_FULL_QUEUE": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 60000,
     "n_buckets": 50,
     "description": "Number of times nsINetworkPredictor::Learn doesn't continue because the queue is full"
   },
   "PREDICTOR_WAIT_TIME": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 3000,
     "n_buckets": 10,
     "description": "Amount of time a predictor event waits in the queue (ms)"
   },
   "PREDICTOR_PREDICT_WORK_TIME": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 3000,
     "n_buckets": 10,
     "description": "Amount of time spent doing the work for predict (ms)",
     "alert_emails": ["necko@mozilla.com"]
   },
   "PREDICTOR_LEARN_WORK_TIME": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 3000,
     "n_buckets": 10,
     "description": "Amount of time spent doing the work for learn (ms)"
   },
   "PREDICTOR_TOTAL_PREDICTIONS": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 1000000,
     "n_buckets": 50,
     "description": "How many actual predictions (preresolves, preconnects, ...) happen"
   },
   "PREDICTOR_TOTAL_PREFETCHES": {
-    "record_in_processes": ["main", "content"],
-    "expires_in_version": "never",
-    "alert_emails": [],
+    "record_in_processes": ["main"],
+    "expires_in_version": "never",
+    "alert_emails": ["hurley@mozilla.com"],
     "bug_numbers": [1016628],
     "kind": "exponential",
     "high": 1000000,
     "n_buckets": 50,
     "description": "How many actual prefetches happen"
   },
   "PREDICTOR_TOTAL_PREFETCHES_USED": {
-    "record_in_processes": ["main", "content"],
-    "expires_in_version": "never",
-    "alert_emails": [],
+    "record_in_processes": ["main"],
+    "expires_in_version": "never",
+    "alert_emails": ["hurley@mozilla.com"],
     "bug_numbers": [1016628],
     "kind": "exponential",
     "high": 1000000,
     "n_buckets": 50,
     "description": "How many prefetches are actually used by a channel"
   },
   "PREDICTOR_PREFETCH_TIME": {
-    "record_in_processes": ["main", "content"],
-    "expires_in_version": "never",
-    "alert_emails": [],
+    "record_in_processes": ["main"],
+    "expires_in_version": "never",
+    "alert_emails": ["hurley@mozilla.com"],
     "bug_numbers": [1016628],
     "kind": "exponential",
     "high": 3000,
     "n_buckets": 10,
     "description": "How long it takes from OnStartRequest to OnStopRequest for a prefetch"
   },
   "PREDICTOR_TOTAL_PRECONNECTS": {
-    "record_in_processes": ["main", "content"],
-    "expires_in_version": "never",
+    "record_in_processes": ["main"],
+    "expires_in_version": "never",
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "kind": "exponential",
     "high": 1000000,
     "n_buckets": 50,
     "description": "How many actual preconnects happen"
   },
   "PREDICTOR_TOTAL_PRECONNECTS_CREATED": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 1000000,
     "n_buckets": 50,
     "description": "How many preconnects actually created a speculative socket"
   },
   "PREDICTOR_TOTAL_PRECONNECTS_USED": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 1000000,
     "n_buckets": 50,
     "description": "How many preconnects actually created a used speculative socket"
   },
   "PREDICTOR_TOTAL_PRECONNECTS_UNUSED": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 1000000,
     "n_buckets": 50,
     "description": "How many preconnects needlessly created a speculative socket"
   },
   "PREDICTOR_TOTAL_PRERESOLVES": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 1000000,
     "n_buckets": 50,
     "description": "How many actual preresolves happen"
   },
   "PREDICTOR_PREDICTIONS_CALCULATED": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 1000000,
     "n_buckets": 50,
     "description": "How many prediction calculations are performed"
   },
   "PREDICTOR_GLOBAL_DEGRADATION": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "linear",
     "high": 100,
     "n_buckets": 50,
     "description": "The global degradation calculated"
   },
   "PREDICTOR_SUBRESOURCE_DEGRADATION": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "linear",
     "high": 100,
     "n_buckets": 50,
     "description": "The degradation calculated for a subresource"
   },
   "PREDICTOR_BASE_CONFIDENCE": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "linear",
     "high": 100,
     "n_buckets": 50,
     "description": "The base confidence calculated for a subresource"
   },
   "PREDICTOR_CONFIDENCE": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "linear",
     "high": 100,
     "n_buckets": 50,
     "description": "The final confidence calculated for a subresource"
   },
   "PREDICTOR_PREDICT_TIME_TO_ACTION": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 3000,
     "n_buckets": 10,
     "description": "How long it takes from the time Predict() is called to the time we take action",
     "alert_emails": ["necko@mozilla.com"]
   },
   "PREDICTOR_PREDICT_TIME_TO_INACTION": {
-    "record_in_processes": ["main", "content"],
+    "record_in_processes": ["main"],
+    "alert_emails": ["hurley@mozilla.com"],
+    "bug_numbers": [881804],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 3000,
     "n_buckets": 10,
     "description": "How long it takes from the time Predict() is called to the time we figure out there's nothing to do"
   },
   "PREDICTOR_PREFETCH_DECISION_REASON": {
     "record_in_processes": ["main"],

--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -440,34 +440,16 @@
     "PRCONNECTCONTINUE_BLOCKING_TIME_NORMAL",
     "PRCONNECTCONTINUE_BLOCKING_TIME_OFFLINE",
     "PRCONNECTCONTINUE_BLOCKING_TIME_SHUTDOWN",
     "PRCONNECT_BLOCKING_TIME_CONNECTIVITY_CHANGE",
     "PRCONNECT_BLOCKING_TIME_LINK_CHANGE",
     "PRCONNECT_BLOCKING_TIME_NORMAL",
     "PRCONNECT_BLOCKING_TIME_OFFLINE",
     "PRCONNECT_BLOCKING_TIME_SHUTDOWN",
-    "PREDICTOR_BASE_CONFIDENCE",
-    "PREDICTOR_CONFIDENCE",
-    "PREDICTOR_GLOBAL_DEGRADATION",
-    "PREDICTOR_LEARN_ATTEMPTS",
-    "PREDICTOR_LEARN_FULL_QUEUE",
-    "PREDICTOR_LEARN_WORK_TIME",
-    "PREDICTOR_PREDICTIONS_CALCULATED",
-    "PREDICTOR_PREDICT_ATTEMPTS",
-    "PREDICTOR_PREDICT_FULL_QUEUE",
-    "PREDICTOR_PREDICT_TIME_TO_INACTION",
-    "PREDICTOR_SUBRESOURCE_DEGRADATION",
-    "PREDICTOR_TOTAL_PRECONNECTS",
-    "PREDICTOR_TOTAL_PRECONNECTS_CREATED",
-    "PREDICTOR_TOTAL_PRECONNECTS_UNUSED",
-    "PREDICTOR_TOTAL_PRECONNECTS_USED",
-    "PREDICTOR_TOTAL_PREDICTIONS",
-    "PREDICTOR_TOTAL_PRERESOLVES",
-    "PREDICTOR_WAIT_TIME",
     "PROCESS_CRASH_SUBMIT_ATTEMPT",
     "PROCESS_CRASH_SUBMIT_SUCCESS",
     "PWMGR_BLOCKLIST_NUM_SITES",
     "PWMGR_LOGIN_LAST_USED_DAYS",
     "PWMGR_MANAGE_COPIED_PASSWORD",
     "PWMGR_MANAGE_COPIED_USERNAME",
     "PWMGR_MANAGE_DELETED",
     "PWMGR_MANAGE_DELETED_ALL",
@@ -1127,36 +1109,16 @@
     "PRCONNECTCONTINUE_BLOCKING_TIME_NORMAL",
     "PRCONNECTCONTINUE_BLOCKING_TIME_OFFLINE",
     "PRCONNECTCONTINUE_BLOCKING_TIME_SHUTDOWN",
     "PRCONNECT_BLOCKING_TIME_CONNECTIVITY_CHANGE",
     "PRCONNECT_BLOCKING_TIME_LINK_CHANGE",
     "PRCONNECT_BLOCKING_TIME_NORMAL",
     "PRCONNECT_BLOCKING_TIME_OFFLINE",
     "PRCONNECT_BLOCKING_TIME_SHUTDOWN",
-    "PREDICTOR_BASE_CONFIDENCE",
-    "PREDICTOR_CONFIDENCE",
-    "PREDICTOR_GLOBAL_DEGRADATION",
-    "PREDICTOR_LEARN_ATTEMPTS",
-    "PREDICTOR_LEARN_FULL_QUEUE",
-    "PREDICTOR_LEARN_WORK_TIME",
-    "PREDICTOR_PREDICTIONS_CALCULATED",
-    "PREDICTOR_PREDICT_ATTEMPTS",
-    "PREDICTOR_PREDICT_FULL_QUEUE",
-    "PREDICTOR_PREDICT_TIME_TO_ACTION",
-    "PREDICTOR_PREDICT_TIME_TO_INACTION",
-    "PREDICTOR_PREDICT_WORK_TIME",
-    "PREDICTOR_SUBRESOURCE_DEGRADATION",
-    "PREDICTOR_TOTAL_PRECONNECTS",
-    "PREDICTOR_TOTAL_PRECONNECTS_CREATED",
-    "PREDICTOR_TOTAL_PRECONNECTS_UNUSED",
-    "PREDICTOR_TOTAL_PRECONNECTS_USED",
-    "PREDICTOR_TOTAL_PREDICTIONS",
-    "PREDICTOR_TOTAL_PRERESOLVES",
-    "PREDICTOR_WAIT_TIME",
     "PROCESS_CRASH_SUBMIT_ATTEMPT",
     "PROCESS_CRASH_SUBMIT_SUCCESS",
     "PWMGR_BLOCKLIST_NUM_SITES",
     "PWMGR_LOGIN_LAST_USED_DAYS",
     "PWMGR_MANAGE_COPIED_PASSWORD",
     "PWMGR_MANAGE_COPIED_USERNAME",
     "PWMGR_MANAGE_DELETED",
     "PWMGR_MANAGE_DELETED_ALL",