--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -1001,56 +1001,59 @@
     "description": "Location accuracy"
   },
   "GEOLOCATION_ERROR": {
     "expires_in_version": "never",
     "kind": "flag",
     "description": "Has seen location error"
   },
   "GEOLOCATION_GETCURRENTPOSITION_SECURE_ORIGIN" : {
-    "expires_in_version" : "55",
+    "alert_emails": ["mds@mozilla.com"],
+    "expires_in_version": "60",
     "kind": "enumerated",
     "n_values": 10,
     "bug_numbers": [1230209],
     "description" : "Number of navigator.geolocation.getCurrentPosition() calls (0=other, 1=http, 2=https)"
   },
   "GEOLOCATION_REQUEST_GRANTED": {
-    "expires_in_version": "55",
+    "alert_emails": ["mds@mozilla.com"],
+    "expires_in_version": "60",
     "kind": "enumerated",
     "n_values": 20,
     "bug_numbers": [1230209],
     "description": "Geolocation requests either granted or denied (0=denied/other, 1=denied/http, 2=denied/https, ..., 10=granted/other, 11=granted/http, 12=granted/https)"
   },
   "GEOLOCATION_WATCHPOSITION_SECURE_ORIGIN" : {
-    "expires_in_version" : "55",
+    "alert_emails": ["mds@mozilla.com"],
+    "expires_in_version": "60",
     "kind": "enumerated",
     "n_values": 10,
     "bug_numbers": [1230209],
     "description" : "Number of navigator.geolocation.watchPosition() calls (0=other, 1=http, 2=https)"
   },
   "GEOLOCATION_WIN8_SOURCE_IS_MLS": {
     "expires_in_version": "default",
     "kind": "boolean",
     "description": "Geolocation on Win8 is either MLS or native"
   },
   "GEOLOCATION_OSX_SOURCE_IS_MLS": {
     "expires_in_version": "default",
     "kind": "boolean",
     "description": "Geolocation on OS X is either MLS or CoreLocation"
   },
   "GEOLOCATION_GETCURRENTPOSITION_VISIBLE": {
-    "alert_emails": ["michelangelo@mozilla.com"],
-    "expires_in_version": "55",
+    "alert_emails": ["mds@mozilla.com"],
+    "expires_in_version": "60",
     "kind": "boolean",
     "bug_numbers": [1255198],
     "description": "This metric is recorded every time a navigator.geolocation.getCurrentPosition() request gets allowed/fulfilled. A false value is recorded if the owner is not visible according to document.isVisible."
   },
   "GEOLOCATION_WATCHPOSITION_VISIBLE": {
-    "alert_emails": ["michelangelo@mozilla.com"],
-    "expires_in_version": "55",
+    "alert_emails": ["mds@mozilla.com"],
+    "expires_in_version": "60",
     "kind": "boolean",
     "bug_numbers": [1255198],
     "description": "This metric is recorded every time a navigator.geolocation.watchPosition() request gets allowed/fulfilled. A false value is recorded if the owner is not visible according to document.isVisible."
   },
   "GPU_PROCESS_LAUNCH_TIME_MS_2" : {
     "alert_emails": ["danderson@mozilla.com"],
     "expires_in_version": "never",
     "bug_numbers": [1297790, 1317796],

--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -283,20 +283,17 @@
     "FX_THUMBNAILS_CAPTURE_TIME_MS",
     "FX_THUMBNAILS_HIT_OR_MISS",
     "FX_THUMBNAILS_STORE_TIME_MS",
     "FX_TOTAL_TOP_VISITS",
     "FX_TOUCH_USED",
     "GDI_INITFONTLIST_TOTAL",
     "GEOLOCATION_ACCURACY_EXPONENTIAL",
     "GEOLOCATION_ERROR",
-    "GEOLOCATION_GETCURRENTPOSITION_SECURE_ORIGIN",
     "GEOLOCATION_OSX_SOURCE_IS_MLS",
-    "GEOLOCATION_REQUEST_GRANTED",
-    "GEOLOCATION_WATCHPOSITION_SECURE_ORIGIN",
     "GEOLOCATION_WIN8_SOURCE_IS_MLS",
     "GFX_CRASH",
     "GRADIENT_DURATION",
     "GRADIENT_RETENTION_TIME",
     "HISTORY_LASTVISITED_TREE_QUERY_TIME_MS",
     "HTTPCONNMGR_TOTAL_SPECULATIVE_CONN",
     "HTTPCONNMGR_UNUSED_SPECULATIVE_CONN",
     "HTTPCONNMGR_USED_SPECULATIVE_CONN",