--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -6968,69 +6968,77 @@
   "VIDEO_H264_SPS_MAX_NUM_REF_FRAMES": {
     "expires_in_version": "55",
     "kind": "enumerated",
     "n_values": 17,
     "description": "SPS.max_num_ref_frames indicates how deep the H.264 queue is going to be, and as such the minimum memory usage by the decoder, from 0 to 16. 17 indicates an invalid value."
   },
   "WEBRTC_ICE_FINAL_CONNECTION_STATE": {
     "alert_emails": ["webrtc-ice-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "53",
+    "bug_numbers": [1319268],
+    "expires_in_version": "58",
     "kind": "enumerated",
     "n_values": 7,
     "description": "The ICE connection state when the PC was closed"
   },
   "WEBRTC_ICE_ON_TIME_TRICKLE_ARRIVAL_TIME": {
     "alert_emails": ["webrtc-ice-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "53",
+    "bug_numbers": [1319268],
+    "expires_in_version": "58",
     "kind": "exponential",
     "high": 10000,
     "n_buckets": 20,
     "description": "The length of time (in milliseconds) that a trickle candidate took to arrive after the start of ICE, given that it arrived when ICE was not in a failure state (ie; a candidate that we could do something with, hence 'on time')"
   },
   "WEBRTC_ICE_LATE_TRICKLE_ARRIVAL_TIME": {
     "alert_emails": ["webrtc-ice-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "53",
+    "bug_numbers": [1319268],
+    "expires_in_version": "58",
     "kind": "exponential",
     "high": 10000,
     "n_buckets": 20,
     "description": "The length of time (in milliseconds) that a trickle candidate took to arrive after the start of ICE, given that it arrived after ICE failed."
   },
   "WEBRTC_ICE_SUCCESS_TIME": {
     "alert_emails": ["webrtc-ice-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "53",
+    "bug_numbers": [1319268],
+    "expires_in_version": "58",
     "kind": "exponential",
     "high": 10000,
     "n_buckets": 20,
     "description": "The length of time (in milliseconds) it took for ICE to complete, given that ICE succeeded."
   },
   "WEBRTC_ICE_FAILURE_TIME": {
     "alert_emails": ["webrtc-ice-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "53",
+    "bug_numbers": [1319268],
+    "expires_in_version": "58",
     "kind": "exponential",
     "high": 10000,
     "n_buckets": 20,
     "description": "The length of time (in milliseconds) it took for ICE to complete, given that it failed."
   },
   "WEBRTC_ICE_SUCCESS_RATE": {
     "alert_emails": ["webrtc-ice-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "53",
+    "bug_numbers": [1319268],
+    "expires_in_version": "58",
     "kind": "boolean",
     "description": "The number of failed ICE Connections (0) vs. number of successful ICE connections (1)."
   },
   "WEBRTC_STUN_RATE_LIMIT_EXCEEDED_BY_TYPE_GIVEN_SUCCESS": {
     "alert_emails": ["webrtc-ice-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "53",
+    "bug_numbers": [1319268],
+    "expires_in_version": "58",
     "kind": "enumerated",
     "n_values": 4,
     "description": "For each successful PeerConnection, bit 0 indicates the short-duration rate limit was reached, bit 1 indicates the long-duration rate limit was reached"
   },
   "WEBRTC_STUN_RATE_LIMIT_EXCEEDED_BY_TYPE_GIVEN_FAILURE": {
     "alert_emails": ["webrtc-ice-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "53",
+    "bug_numbers": [1319268],
+    "expires_in_version": "58",
     "kind": "enumerated",
     "n_values": 4,
     "description": "For each failed PeerConnection, bit 0 indicates the short-duration rate limit was reached, bit 1 indicates the long-duration rate limit was reached"
   },
   "WEBRTC_AVSYNC_WHEN_AUDIO_LAGS_VIDEO_MS": {
     "alert_emails": ["webrtc-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "exponential",
@@ -7273,42 +7281,36 @@
   "WEBRTC_CALL_DURATION": {
     "alert_emails": ["webrtc-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 10000,
     "n_buckets": 1000,
     "description": "The length of time (in seconds) that a call lasted."
   },
-  "WEBRTC_CALL_COUNT": {
-    "alert_emails": ["webrtc-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "48",
-    "kind": "exponential",
-    "high": 500,
-    "n_buckets": 50,
-    "description": "The number of calls made during a session."
-  },
   "WEBRTC_CALL_COUNT_2": {
     "alert_emails": ["webrtc-telemetry-alerts@mozilla.com"],
     "bug_numbers": [1261063],
     "expires_in_version": "never",
     "kind": "count",
     "description": "The number of calls made during a session."
   },
   "WEBRTC_ICE_ADD_CANDIDATE_ERRORS_GIVEN_SUCCESS": {
     "alert_emails": ["webrtc-ice-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "53",
+    "bug_numbers": [1319268],
+    "expires_in_version": "58",
     "kind": "linear",
     "high": 30,
     "n_buckets": 29,
     "description": "The number of times AddIceCandidate failed on a given PeerConnection, given that ICE succeeded."
   },
   "WEBRTC_ICE_ADD_CANDIDATE_ERRORS_GIVEN_FAILURE": {
     "alert_emails": ["webrtc-ice-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "53",
+    "bug_numbers": [1319268],
+    "expires_in_version": "58",
     "kind": "linear",
     "high": 30,
     "n_buckets": 29,
     "description": "The number of times AddIceCandidate failed on a given PeerConnection, given that ICE failed."
   },
   "WEBRTC_GET_USER_MEDIA_SECURE_ORIGIN": {
     "alert_emails": ["seceng@mozilla.org"],
     "expires_in_version": "55",
@@ -10206,17 +10208,18 @@
     "alert_emails": ["jdaggett@mozilla.com"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 50,
     "description": "Compression ratio of WOFF2 data (%)"
   },
   "WEBRTC_ICE_CHECKING_RATE": {
     "alert_emails": ["webrtc-ice-telemetry-alerts@mozilla.com"],
-    "expires_in_version": "53",
+    "bug_numbers": [1319268],
+    "expires_in_version": "58",
     "kind": "boolean",
     "bug_numbers": [1188391],
     "description": "The number of ICE connections which immediately failed (0) vs. reached at least checking state (1)."
   },
   "ALERTS_SERVICE_DND_ENABLED": {
     "alert_emails": ["firefox-dev@mozilla.org"],
     "bug_numbers": [1219030],
     "expires_in_version": "50",

--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -1691,43 +1691,32 @@
     "WEBRTC_AUDIO_QUALITY_INBOUND_JITTER",
     "WEBRTC_AUDIO_QUALITY_INBOUND_PACKETLOSS_RATE",
     "WEBRTC_AUDIO_QUALITY_OUTBOUND_BANDWIDTH_KBITS",
     "WEBRTC_AUDIO_QUALITY_OUTBOUND_JITTER",
     "WEBRTC_AUDIO_QUALITY_OUTBOUND_PACKETLOSS_RATE",
     "WEBRTC_AUDIO_QUALITY_OUTBOUND_RTT",
     "WEBRTC_AVSYNC_WHEN_AUDIO_LAGS_VIDEO_MS",
     "WEBRTC_AVSYNC_WHEN_VIDEO_LAGS_AUDIO_MS",
-    "WEBRTC_CALL_COUNT",
     "WEBRTC_CALL_DURATION",
     "WEBRTC_CALL_TYPE",
     "WEBRTC_DATACHANNEL_NEGOTIATED",
     "WEBRTC_GET_USER_MEDIA_SECURE_ORIGIN",
     "WEBRTC_GET_USER_MEDIA_TYPE",
-    "WEBRTC_ICE_ADD_CANDIDATE_ERRORS_GIVEN_FAILURE",
-    "WEBRTC_ICE_ADD_CANDIDATE_ERRORS_GIVEN_SUCCESS",
-    "WEBRTC_ICE_FAILURE_TIME",
-    "WEBRTC_ICE_FINAL_CONNECTION_STATE",
-    "WEBRTC_ICE_LATE_TRICKLE_ARRIVAL_TIME",
-    "WEBRTC_ICE_ON_TIME_TRICKLE_ARRIVAL_TIME",
-    "WEBRTC_ICE_SUCCESS_RATE",
-    "WEBRTC_ICE_SUCCESS_TIME",
     "WEBRTC_LOAD_STATE_NORMAL",
     "WEBRTC_LOAD_STATE_NORMAL_SHORT",
     "WEBRTC_LOAD_STATE_RELAXED",
     "WEBRTC_LOAD_STATE_RELAXED_SHORT",
     "WEBRTC_LOAD_STATE_STRESSED",
     "WEBRTC_LOAD_STATE_STRESSED_SHORT",
     "WEBRTC_MAX_AUDIO_RECEIVE_TRACK",
     "WEBRTC_MAX_AUDIO_SEND_TRACK",
     "WEBRTC_MAX_VIDEO_RECEIVE_TRACK",
     "WEBRTC_MAX_VIDEO_SEND_TRACK",
     "WEBRTC_RENEGOTIATIONS",
-    "WEBRTC_STUN_RATE_LIMIT_EXCEEDED_BY_TYPE_GIVEN_FAILURE",
-    "WEBRTC_STUN_RATE_LIMIT_EXCEEDED_BY_TYPE_GIVEN_SUCCESS",
     "WEBRTC_VIDEO_DECODER_BITRATE_AVG_PER_CALL_KBPS",
     "WEBRTC_VIDEO_DECODER_BITRATE_STD_DEV_PER_CALL_KBPS",
     "WEBRTC_VIDEO_DECODER_DISCARDED_PACKETS_PER_CALL_PPM",
     "WEBRTC_VIDEO_DECODER_FRAMERATE_10X_STD_DEV_PER_CALL",
     "WEBRTC_VIDEO_DECODER_FRAMERATE_AVG_PER_CALL",
     "WEBRTC_VIDEO_DECODE_ERROR_TIME_PERMILLE",
     "WEBRTC_VIDEO_ENCODER_BITRATE_AVG_PER_CALL_KBPS",
     "WEBRTC_VIDEO_ENCODER_BITRATE_STD_DEV_PER_CALL_KBPS",