diff --git a/infra/bots/android_map.json b/infra/bots/android_map.json
index fe9b5ef539..04e1c3b3fa 100644
--- a/infra/bots/android_map.json
+++ b/infra/bots/android_map.json
@@ -7,7 +7,7 @@
   "GalaxyS7_G930FD": ["herolte",     "NRD90M_G930FXXU1DQAS"],
   "GalaxyTab3":      ["goyawifi",    "JDQ39"],
   "MotoG4":          ["athene",      "MPJ24.139-64"],
-  "NVIDIA_Shield":   ["foster",      "MRA58K"],
+  "NVIDIA_Shield":   ["foster",      "NRD90M"],
   "Nexus10":         ["manta",       "LMY49J"],
   "Nexus5":          ["hammerhead",  "M4B30Z"],
   "Nexus6":          ["shamu",       "M"],
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index baf8a3d420..33794560da 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -4640,7 +4640,7 @@
         "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "device_os:MRA58K",
+        "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -4690,7 +4690,7 @@
         "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:MRA58K",
+        "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -4740,7 +4740,7 @@
         "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
-        "device_os:MRA58K",
+        "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -4790,7 +4790,7 @@
         "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:MRA58K",
+        "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -10481,7 +10481,7 @@
         "Build-Ubuntu-Clang-arm64-Debug-Android"
       ],
       "dimensions": [
-        "device_os:MRA58K",
+        "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -10531,7 +10531,7 @@
         "Build-Ubuntu-Clang-arm64-Debug-Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:MRA58K",
+        "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -10581,7 +10581,7 @@
         "Build-Ubuntu-Clang-arm64-Release-Android"
       ],
       "dimensions": [
-        "device_os:MRA58K",
+        "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
         "pool:Skia"
@@ -10631,7 +10631,7 @@
         "Build-Ubuntu-Clang-arm64-Release-Android_Vulkan"
       ],
       "dimensions": [
-        "device_os:MRA58K",
+        "device_os:NRD90M",
         "device_type:foster",
         "os:Android",
         "pool:Skia"