diff --git a/tools_webrtc/mb/gn_isolate_map.pyl b/tools_webrtc/mb/gn_isolate_map.pyl
index 526eecfebe..02e84788e9 100644
--- a/tools_webrtc/mb/gn_isolate_map.pyl
+++ b/tools_webrtc/mb/gn_isolate_map.pyl
@@ -21,7 +21,7 @@
   },
   "AppRTCMobile_test_apk": {
     "label": "//examples:AppRTCMobile_test_apk",
-    "type": "additional_compile_target",
+    "type": "console_test_launcher",
   },
   "android_junit_tests": {
     "label": "//:android_junit_tests",
@@ -37,7 +37,7 @@
   },
   "apprtcmobile_tests": {
     "label": "//examples:apprtcmobile_tests",
-    "type": "raw",
+    "type": "console_test_launcher",
   },
   "audio_decoder_unittests": {
     "label": "//modules/audio_coding:audio_decoder_unittests",
@@ -57,7 +57,7 @@
   },
   "android_instrumentation_test_apk": {
     "label": "//sdk/android:android_instrumentation_test_apk",
-    "type": "additional_compile_target",
+    "type": "console_test_launcher",
   },
   "low_bandwidth_audio_test": {
     "label": "//audio:low_bandwidth_audio_test",
@@ -104,11 +104,11 @@
   },
   "sdk_framework_unittests": {
     "label": "//sdk:sdk_framework_unittests",
-    "type": "raw",
+    "type": "console_test_launcher",
   },
   "sdk_unittests": {
     "label": "//sdk:sdk_unittests",
-    "type": "raw",
+    "type": "console_test_launcher",
   },
   "system_wrappers_unittests": {
     "label": "//system_wrappers:system_wrappers_unittests",
diff --git a/tools_webrtc/mb/mb_config.pyl b/tools_webrtc/mb/mb_config.pyl
index 787bc131db..89dd294f87 100644
--- a/tools_webrtc/mb/mb_config.pyl
+++ b/tools_webrtc/mb/mb_config.pyl
@@ -440,6 +440,10 @@
       'gn_args': 'dcheck_always_on=true',
     },
 
+    'dcheck_off': {
+      'gn_args': 'dcheck_always_on=false',
+    },
+
     'debug': {
       'gn_args': 'is_debug=true',
     },
@@ -504,7 +508,7 @@
     # 100% release build without DCHECKs while 'release_bot' is a partial
     # release configs since `dcheck_always_on` is set to true.
     'pure_release_bot': {
-      'mixins': ['release', 'goma'],
+      'mixins': ['release', 'goma', 'dcheck_off'],
     },
     'release_bot': {
       'mixins': ['pure_release_bot', 'dcheck_always_on'],