diff --git a/infra/bots/android_map.json b/infra/bots/android_map.json
index ab089c8..f20f6cd 100644
--- a/infra/bots/android_map.json
+++ b/infra/bots/android_map.json
@@ -12,7 +12,7 @@
   "Nexus10":         ["manta",       "LMY49J"],
   "Nexus5":          ["hammerhead",  "M4B30Z"],
   "Nexus6":          ["shamu",       "M"],
-  "Nexus6p":         ["angler",      "NMF26C"],
+  "Nexus6p":         ["angler",      "OPP1.170223.012"],
   "Nexus7":          ["grouper",     "LMY47V"],
   "Nexus7v2":        ["flo",         "M"],
   "NexusPlayer":     ["fugu",        "OPP1.170223.012"],
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index babb1de..2441a06 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -5438,7 +5438,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26C",
+        "device_os:OPP1.170223.012",
         "device_type:angler",
         "os:Android",
         "pool:Skia"
@@ -5486,7 +5486,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26C",
+        "device_os:OPP1.170223.012",
         "device_type:angler",
         "os:Android",
         "pool:Skia"
@@ -5534,7 +5534,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26C",
+        "device_os:OPP1.170223.012",
         "device_type:angler",
         "os:Android",
         "pool:Skia"
@@ -5582,7 +5582,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26C",
+        "device_os:OPP1.170223.012",
         "device_type:angler",
         "os:Android",
         "pool:Skia"
@@ -12231,7 +12231,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26C",
+        "device_os:OPP1.170223.012",
         "device_type:angler",
         "os:Android",
         "pool:Skia"
@@ -12279,7 +12279,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26C",
+        "device_os:OPP1.170223.012",
         "device_type:angler",
         "os:Android",
         "pool:Skia"
@@ -12327,7 +12327,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26C",
+        "device_os:OPP1.170223.012",
         "device_type:angler",
         "os:Android",
         "pool:Skia"
@@ -12375,7 +12375,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_os:NMF26C",
+        "device_os:OPP1.170223.012",
         "device_type:angler",
         "os:Android",
         "pool:Skia"