Reland "Use recipe_engine swarming recipe module in the chromium recipes."

This is a reland of 556afbddace285f66ddec73942a6bddf6d82cb37.

Changed default gpu dimensions from "none" to None. Also changing task_name_suffix
to builder_info in order to add back in needed buildername/buildnumber tags.

Original change's description:
> Use recipe_engine swarming recipe module in the chromium recipes.
>
> Currently, we use the swarming recipe module, resulting in a duplication of
> work. Changing the way the default task_name is being created to remove the
> passing of extraneous variables when creating a SwarmingTask.
>
> Recipe-Manual-Change: build_limited_scripts_slave
> Bug: 932821
> Change-Id: I55513eae1ad9e4ab9556efcf57b890be9a1b05ea
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/build/+/1509695
> Commit-Queue: Karen Qian <karenqian@google.com>
> Reviewed-by: Stephen Martinis <martiniss@chromium.org>
> Reviewed-by: Marc-Antoine Ruel <maruel@chromium.org>

Recipe-Manual-Change: build_limited_scripts_slave
Bug: 932821
Change-Id: I0e7f44d32b2ee41c80ae8034b398fc44891ca5af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/build/+/1671861
Commit-Queue: Karen Qian <karenqian@google.com>
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
diff --git a/scripts/slave/README.recipes.md b/scripts/slave/README.recipes.md
index 02f9781..56d0d7a 100644
--- a/scripts/slave/README.recipes.md
+++ b/scripts/slave/README.recipes.md
@@ -1089,7 +1089,7 @@
   name: The name of the step.
 ### *recipe_modules* / [chromium\_swarming](/scripts/slave/recipe_modules/chromium_swarming)
 
-[DEPS](/scripts/slave/recipe_modules/chromium_swarming/__init__.py#5): [build](#recipe_modules-build), [chromium](#recipe_modules-chromium), [chromium\_checkout](#recipe_modules-chromium_checkout), [isolate](#recipe_modules-isolate), [swarming\_client](#recipe_modules-swarming_client), [test\_utils](#recipe_modules-test_utils), [traceback](#recipe_modules-traceback), [depot\_tools/tryserver][depot_tools/recipe_modules/tryserver], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/runtime][recipe_engine/recipe_modules/runtime], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/swarming][recipe_engine/recipe_modules/swarming]
+[DEPS](/scripts/slave/recipe_modules/chromium_swarming/__init__.py#5): [build](#recipe_modules-build), [chromium](#recipe_modules-chromium), [chromium\_checkout](#recipe_modules-chromium_checkout), [isolate](#recipe_modules-isolate), [swarming\_client](#recipe_modules-swarming_client), [test\_utils](#recipe_modules-test_utils), [traceback](#recipe_modules-traceback), [depot\_tools/tryserver][depot_tools/recipe_modules/tryserver], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/runtime][recipe_engine/recipe_modules/runtime], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/swarming][recipe_engine/recipe_modules/swarming]
 
 #### **class [SwarmingApi](/scripts/slave/recipe_modules/chromium_swarming/api.py#157)([RecipeApi][recipe_engine/wkt/RecipeApi]):**
 
@@ -1120,11 +1120,11 @@
 
 Tags can be added per individual task.
 
-&mdash; **def [check\_client\_version](/scripts/slave/recipe_modules/chromium_swarming/api.py#685)(self, step_test_data=None):**
+&mdash; **def [check\_client\_version](/scripts/slave/recipe_modules/chromium_swarming/api.py#701)(self, step_test_data=None):**
 
 Yields steps to verify compatibility with swarming_client version.
 
-&mdash; **def [collect\_task](/scripts/slave/recipe_modules/chromium_swarming/api.py#1011)(self, task, \*\*kwargs):**
+&mdash; **def [collect\_task](/scripts/slave/recipe_modules/chromium_swarming/api.py#1042)(self, task, \*\*kwargs):**
 
 Waits for a single triggered task to finish.
 
@@ -1136,7 +1136,7 @@
   task: SwarmingTask instance, previously triggered with 'trigger' method.
   kwargs: passed to recipe step constructor as-is.
 
-&mdash; **def [configure\_swarming](/scripts/slave/recipe_modules/chromium_swarming/api.py#1655)(self, project_name, precommit, mastername=None, default_priority=None, path_to_testing_dir=None):**
+&mdash; **def [configure\_swarming](/scripts/slave/recipe_modules/chromium_swarming/api.py#1683)(self, project_name, precommit, mastername=None, default_priority=None, path_to_testing_dir=None):**
 
 Configures default swarming dimensions and tags.
 
@@ -1191,7 +1191,7 @@
 
 &emsp; **@default_user.setter**<br>&mdash; **def [default\_user](/scripts/slave/recipe_modules/chromium_swarming/api.py#348)(self, value):**
 
-&mdash; **def [generate\_trigger\_task\_shard\_args](/scripts/slave/recipe_modules/chromium_swarming/api.py#762)(self, task, \*\*kwargs):**
+&mdash; **def [generate\_trigger\_task\_shard\_args](/scripts/slave/recipe_modules/chromium_swarming/api.py#778)(self, task, \*\*kwargs):**
 
 Generates the arguments for triggered shards.
 
@@ -1202,11 +1202,11 @@
   pre_trigger_args: All arguments up to and including 'trigger'
   post_triggers_args: All arguments following 'trigger'
 
-&mdash; **def [get\_collect\_cmd\_args](/scripts/slave/recipe_modules/chromium_swarming/api.py#1606)(self, task):**
+&mdash; **def [get\_collect\_cmd\_args](/scripts/slave/recipe_modules/chromium_swarming/api.py#1634)(self, task):**
 
 SwarmingTask -> argument list for go swarming command.
 
-&mdash; **def [get\_step\_name](/scripts/slave/recipe_modules/chromium_swarming/api.py#1437)(self, prefix, task):**
+&mdash; **def [get\_step\_name](/scripts/slave/recipe_modules/chromium_swarming/api.py#1465)(self, prefix, task):**
 
 SwarmingTask -> name of a step of a waterfall.
 
@@ -1219,7 +1219,7 @@
 Returns:
   '[<prefix>] <task name> on <OS>'
 
-&mdash; **def [gtest\_task](/scripts/slave/recipe_modules/chromium_swarming/api.py#620)(self, name=None, isolated=None, extra_args=None, cipd_packages=None, merge=None, \*\*kwargs):**
+&mdash; **def [gtest\_task](/scripts/slave/recipe_modules/chromium_swarming/api.py#635)(self, name=None, isolated=None, extra_args=None, cipd_packages=None, merge=None, \*\*kwargs):**
 
 Returns a new SwarmingTask instance to run an isolated gtest on Swarming.
 
@@ -1230,7 +1230,7 @@
 
 &mdash; **def [initialize](/scripts/slave/recipe_modules/chromium_swarming/api.py#225)(self):**
 
-&mdash; **def [isolated\_script\_task](/scripts/slave/recipe_modules/chromium_swarming/api.py#651)(self):**
+&mdash; **def [isolated\_script\_task](/scripts/slave/recipe_modules/chromium_swarming/api.py#667)(self):**
 
 Returns a new SwarmingTask to run an isolated script test on Swarming.
 
@@ -1260,7 +1260,7 @@
 example WinXP try bot recipe may explicitly specify 'Windows-XP-SP3'
 dimension.
 
-&mdash; **def [report\_stats](/scripts/slave/recipe_modules/chromium_swarming/api.py#1033)(self):**
+&mdash; **def [report\_stats](/scripts/slave/recipe_modules/chromium_swarming/api.py#1064)(self):**
 
 Report statistics on all tasks ran so far.
 
@@ -1282,7 +1282,7 @@
 
 Changes URL of Swarming server to use.
 
-&mdash; **def [task](/scripts/slave/recipe_modules/chromium_swarming/api.py#473)(self, name=None, isolated=None, ignore_task_failure=False, shards=1, shard_indices=None, task_output_dir=None, extra_args=None, idempotent=None, cipd_packages=None, build_properties=None, builder_name=None, build_number=None, merge=None, trigger_script=None, named_caches=None, service_account=None, raw_cmd=None, env_prefixes=None, env=None, optional_dimensions=None, task_to_retry=None, failure_as_exception=True):**
+&mdash; **def [task](/scripts/slave/recipe_modules/chromium_swarming/api.py#473)(self, name=None, build_properties=None, cipd_packages=None, collect_step=None, env=None, env_prefixes=None, extra_args=None, failure_as_exception=True, idempotent=None, ignore_task_failure=False, isolated=None, merge=None, named_caches=None, optional_dimensions=None, raw_cmd=None, service_account=None, shards=1, shard_indices=None, task_output_dir=None, task_to_retry=None, trigger_script=None):**
 
 Returns a new SwarmingTask instance to run an isolated executable on
 Swarming.
@@ -1326,10 +1326,6 @@
   * build_properties: An optional dict containing various build properties.
       These are typically but not necessarily the properties emitted by
       bot_update.
-  * builder_name: An optional builder name. Defaults to builder name passed
-      by buildbucket or to the recipe property (in that order).
-  * build_number: An optional build number. Defaults to build number passed
-      by buildbucket or to the recipe property (in that order).
   * merge: An optional dict containing:
     * "script": path to a script to call to post process and merge the
           collected outputs from the tasks. The script should take one
@@ -1369,11 +1365,11 @@
       successful shards from 'task_to_retry' will be merged with the new
       shards in this task.
   * failure_as_exception: Boolean. Whether test failures should throw a
-    recipe exception during the collet step.
+    recipe exception during the collect step.
 
 &emsp; **@task_output_stdout.setter**<br>&mdash; **def [task\_output\_stdout](/scripts/slave/recipe_modules/chromium_swarming/api.py#413)(self, value):**
 
-&mdash; **def [trigger\_all\_task\_shards](/scripts/slave/recipe_modules/chromium_swarming/api.py#919)(self, task, shard_indices, \*\*kwargs):**
+&mdash; **def [trigger\_all\_task\_shards](/scripts/slave/recipe_modules/chromium_swarming/api.py#950)(self, task, shard_indices, \*\*kwargs):**
 
 Triggers all shards as a single step.
 
@@ -1383,7 +1379,7 @@
 Returns:
   StepResult from the step.
 
-&mdash; **def [trigger\_task](/scripts/slave/recipe_modules/chromium_swarming/api.py#690)(self, task, \*\*kwargs):**
+&mdash; **def [trigger\_task](/scripts/slave/recipe_modules/chromium_swarming/api.py#706)(self, task, \*\*kwargs):**
 
 Triggers one task.
 
@@ -1401,7 +1397,7 @@
 Returns:
   A list of StepResults, one for each shard triggered.
 
-&mdash; **def [trigger\_task\_shard](/scripts/slave/recipe_modules/chromium_swarming/api.py#960)(self, task, shard_index, \*\*kwargs):**
+&mdash; **def [trigger\_task\_shard](/scripts/slave/recipe_modules/chromium_swarming/api.py#991)(self, task, shard_index, \*\*kwargs):**
 
 Triggers a single shard for a task.
 
@@ -1416,7 +1412,7 @@
 
 Enables or disables verbose output in swarming scripts.
 
-&mdash; **def [wait\_for\_finished\_task\_set](/scripts/slave/recipe_modules/chromium_swarming/api.py#1346)(self, task_sets, suffix=None, attempts=0):**
+&mdash; **def [wait\_for\_finished\_task\_set](/scripts/slave/recipe_modules/chromium_swarming/api.py#1374)(self, task_sets, suffix=None, attempts=0):**
 
 Waits for a finished set of tasks.
 
@@ -1773,7 +1769,7 @@
 
 Checks out the dart code and prepares it for building.
 
-&mdash; **def [collect\_all](/scripts/slave/recipe_modules/dart/api.py#226)(self, steps):**
+&mdash; **def [collect\_all](/scripts/slave/recipe_modules/dart/api.py#235)(self, steps):**
 
 Collects the results of a sharded test run.
 
@@ -1781,7 +1777,7 @@
 
 Returns the path to the checked-in SDK dart executable.
 
-&mdash; **def [delete\_debug\_log](/scripts/slave/recipe_modules/dart/api.py#608)(self):**
+&mdash; **def [delete\_debug\_log](/scripts/slave/recipe_modules/dart/api.py#617)(self):**
 
 Deletes the debug log file
 
@@ -1795,7 +1791,7 @@
 
 Kills leftover tasks from previous runs or steps.
 
-&mdash; **def [read\_debug\_log](/scripts/slave/recipe_modules/dart/api.py#596)(self):**
+&mdash; **def [read\_debug\_log](/scripts/slave/recipe_modules/dart/api.py#605)(self):**
 
 Reads the debug log file
 
@@ -1804,7 +1800,7 @@
 Runs test.py in the given isolate, sharded over several swarming tasks.
 Returns the created tasks, which can be collected with collect_all().
 
-&mdash; **def [test](/scripts/slave/recipe_modules/dart/api.py#614)(self, test_data):**
+&mdash; **def [test](/scripts/slave/recipe_modules/dart/api.py#623)(self, test_data):**
 
 Reads the test-matrix.json file in checkout and runs each step listed
 in the file.
@@ -5429,9 +5425,9 @@
 
 See PROPERTIES for documentation on the recipe's interface.
 
-&mdash; **def [RunSteps](/scripts/slave/recipes/v8/flako.py#537)(api, bisect_mastername, bisect_buildername, build_config, extra_args, initial_commit_offset, max_calibration_attempts, isolated_name, num_shards, repetitions, repro_only, swarming_dimensions, swarming_priority, swarming_expiration, test_name, timeout_sec, total_timeout_sec, to_revision, variant):**
+&mdash; **def [RunSteps](/scripts/slave/recipes/v8/flako.py#543)(api, bisect_mastername, bisect_buildername, build_config, extra_args, initial_commit_offset, max_calibration_attempts, isolated_name, num_shards, repetitions, repro_only, swarming_dimensions, swarming_priority, swarming_expiration, test_name, timeout_sec, total_timeout_sec, to_revision, variant):**
 
-&mdash; **def [bisect](/scripts/slave/recipes/v8/flako.py#435)(api, depot, initial_commit_offset, is_bad_func, offset):**
+&mdash; **def [bisect](/scripts/slave/recipes/v8/flako.py#441)(api, depot, initial_commit_offset, is_bad_func, offset):**
 
 Exercises the bisection control flow.
 
@@ -5444,7 +5440,7 @@
       bad.
   offset: Offset at which to start bisection.
 
-&mdash; **def [setup\_swarming](/scripts/slave/recipes/v8/flako.py#518)(api, swarming_dimensions, swarming_priority, swarming_expiration):**
+&mdash; **def [setup\_swarming](/scripts/slave/recipes/v8/flako.py#524)(api, swarming_dimensions, swarming_priority, swarming_expiration):**
 ### *recipes* / [v8/node\_integration](/scripts/slave/recipes/v8/node_integration.py)
 
 [DEPS](/scripts/slave/recipes/v8/node_integration.py#13): [chromium](#recipe_modules-chromium), [goma](#recipe_modules-goma), [trigger](#recipe_modules-trigger), [v8](#recipe_modules-v8), [zip](#recipe_modules-zip), [depot\_tools/gclient][depot_tools/recipe_modules/gclient], [depot\_tools/gsutil][depot_tools/recipe_modules/gsutil], [depot\_tools/tryserver][depot_tools/recipe_modules/tryserver], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/runtime][recipe_engine/recipe_modules/runtime], [recipe\_engine/step][recipe_engine/recipe_modules/step]
diff --git a/scripts/slave/recipe_modules/chromium_swarming/__init__.py b/scripts/slave/recipe_modules/chromium_swarming/__init__.py
index 3b9bfc2..5c95d07 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/__init__.py
+++ b/scripts/slave/recipe_modules/chromium_swarming/__init__.py
@@ -9,6 +9,7 @@
   'depot_tools/tryserver',
   'isolate',
   'recipe_engine/buildbucket',
+  'recipe_engine/cipd',
   'recipe_engine/context',
   'recipe_engine/json',
   'recipe_engine/path',
diff --git a/scripts/slave/recipe_modules/chromium_swarming/api.py b/scripts/slave/recipe_modules/chromium_swarming/api.py
index d00259d..078717b 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/api.py
+++ b/scripts/slave/recipe_modules/chromium_swarming/api.py
@@ -119,10 +119,10 @@
 def text_for_task(task):
   lines = []
 
-  if task.dimensions.get('id'):
-    lines.append('Bot id: %r' % task.dimensions['id'])
-  if task.dimensions.get('os'):
-    lines.append('Run on OS: %r' % task.dimensions['os'])
+  if task.request[0].dimensions.get('id'):
+    lines.append('Bot id: %r' % task.request[0].dimensions['id'])
+  if task.request[0].dimensions.get('os'):
+    lines.append('Run on OS: %r' % task.request[0].dimensions['os'])
 
   return '<br/>'.join(lines)
 
@@ -190,7 +190,7 @@
     # even if misconfigured.
     self._default_dimensions = {
       'cpu': 'x86-64',
-      'gpu': 'none',
+      'gpu': None,
     }
     # Expirations are set to mildly good values and will be tightened soon.
     self._default_expiration = 60*60
@@ -470,14 +470,13 @@
     """
     return self.m.path.join(self._path_to_testing_dir, 'merge_scripts', name)
 
-  def task(self, name=None, isolated=None, ignore_task_failure=False,
-           shards=1, shard_indices=None, task_output_dir=None, extra_args=None,
-           idempotent=None, cipd_packages=None, build_properties=None,
-           builder_name=None, build_number=None,
-           merge=None, trigger_script=None, named_caches=None,
-           service_account=None, raw_cmd=None, env_prefixes=None, env=None,
-           optional_dimensions=None, task_to_retry=None,
-           failure_as_exception=True):
+  def task(self, name=None, build_properties=None, cipd_packages=None,
+           collect_step=None, env=None, env_prefixes=None, extra_args=None,
+           failure_as_exception=True, idempotent=None,
+           ignore_task_failure=False, isolated=None, merge=None,
+           named_caches=None, optional_dimensions=None, raw_cmd=None,
+           service_account=None, shards=1, shard_indices=None,
+           task_output_dir=None, task_to_retry=None, trigger_script=None):
     """Returns a new SwarmingTask instance to run an isolated executable on
     Swarming.
 
@@ -520,10 +519,6 @@
       * build_properties: An optional dict containing various build properties.
           These are typically but not necessarily the properties emitted by
           bot_update.
-      * builder_name: An optional builder name. Defaults to builder name passed
-          by buildbucket or to the recipe property (in that order).
-      * build_number: An optional build number. Defaults to build number passed
-          by buildbucket or to the recipe property (in that order).
       * merge: An optional dict containing:
         * "script": path to a script to call to post process and merge the
               collected outputs from the tasks. The script should take one
@@ -563,58 +558,78 @@
           successful shards from 'task_to_retry' will be merged with the new
           shards in this task.
       * failure_as_exception: Boolean. Whether test failures should throw a
-        recipe exception during the collet step.
+        recipe exception during the collect step.
     """
+
+    if not collect_step:
+      collect_step = functools.partial(
+        self._default_collect_step, failure_as_exception=failure_as_exception)
+
+    ensure_file = self.m.cipd.EnsureFile()
+    if cipd_packages:
+      for package in cipd_packages:
+        ensure_file.add_package(package[1], package[2], package[0])
+
+    env_prefixes = {
+      var: list(paths) for var, paths in (env_prefixes or {}).items()}
+
     if idempotent is None:
       idempotent = self.default_idempotent
 
+    init_env = self.default_env.copy()
+    init_env.update(env or {})
+
+    optional_dimensions_var = None
+    if optional_dimensions:
+      optional_dimensions_var = optional_dimensions.copy()
+
+    shard_indices = shard_indices or range(shards)
+
     spec_name = ''
     builder_id = self.m.buildbucket.build.builder
     if builder_id.bucket and builder_id.project:
       spec_name = '%s.%s:%s' % (
           builder_id.project, builder_id.bucket, builder_id.builder)
 
-    init_env = dict(self.default_env)
-    if env: # pragma: no cover
-      init_env.update(env)
+    builder_info = None
+    buildername = self.m.buildbucket.builder_name
+    if buildername:
+      builder_info = (buildername, (self.m.buildbucket.build.number or -1))
 
-    builder_name = (builder_name or self.m.buildbucket.builder_name)
-    build_number = (build_number or self.m.buildbucket.build.number)
+    request = (self.m.swarming.task_request().
+      with_name(name or '').
+      with_priority(self.default_priority).
+      with_service_account(service_account or '').
+      with_user(self.default_user or ''))
 
-    if shard_indices is None:
-      shard_indices = range(shards)
-    collect_step = functools.partial(
-        self._default_collect_step, failure_as_exception=failure_as_exception)
+    request = (request.with_slice(0, request[0].
+      with_cipd_ensure_file(ensure_file).
+      with_command(raw_cmd or []).
+      with_dimensions(**self._default_dimensions).
+      with_env_vars(**init_env.copy()).
+      with_env_prefixes(**env_prefixes).
+      with_execution_timeout_secs(self.default_hard_timeout).
+      with_expiration_secs(self.default_expiration).
+      with_io_timeout_secs(self.default_io_timeout).
+      with_isolated(isolated or ('0' * 40)).
+      with_idempotent(idempotent)))
+
     return SwarmingTask(
-        name=name,
-        isolated=isolated,
-        dimensions=self._default_dimensions,
-        env=init_env,
-        priority=self.default_priority,
-        shards=shards,
-        shard_indices=shard_indices,
-        spec_name=spec_name,
-        buildername=builder_name,
-        buildnumber=build_number,
-        user=self.default_user,
-        expiration=self.default_expiration,
-        io_timeout=self.default_io_timeout,
-        hard_timeout=self.default_hard_timeout,
-        idempotent=idempotent,
-        ignore_task_failure=ignore_task_failure,
-        extra_args=extra_args,
-        collect_step=collect_step,
-        task_output_dir=task_output_dir,
-        cipd_packages=cipd_packages or [],
-        build_properties=build_properties,
-        merge=merge,
-        trigger_script=trigger_script,
-        named_caches=named_caches,
-        service_account=service_account,
-        raw_cmd=raw_cmd,
-        env_prefixes=env_prefixes,
-        optional_dimensions=optional_dimensions,
-        task_to_retry=task_to_retry,
+      request=request,
+      builder_info=builder_info,
+      collect_step=collect_step,
+      extra_args=extra_args,
+      ignore_task_failure=ignore_task_failure,
+      named_caches=named_caches,
+      optional_dimensions=optional_dimensions_var,
+      shard_indices=shard_indices,
+      shards=shards,
+      spec_name=spec_name,
+      task_output_dir=task_output_dir,
+      task_to_retry=task_to_retry,
+      build_properties=build_properties,
+      merge=merge,
+      trigger_script=trigger_script
     )
 
   def gtest_task(self, name=None, isolated=None, extra_args=None,
@@ -643,9 +658,10 @@
         'standard_gtest_merge.py')}
 
     # Make a task, configure it to be collected through shim script.
-    task = self.task(name, isolated, extra_args=extra_args,
-                     cipd_packages=cipd_packages, merge=merge, **kwargs)
-    task.collect_step = self._gtest_collect_step
+    task = self.task(name=name, cipd_packages=cipd_packages,
+                     collect_step=self._gtest_collect_step,
+                     extra_args=extra_args, isolated=isolated, merge=merge,
+                     **kwargs)
     return task
 
   def isolated_script_task(self):
@@ -706,8 +722,8 @@
     """
     assert isinstance(task, SwarmingTask)
     assert task.task_name not in self._pending_tasks, (
-        'Triggered same task twice: %s' % task.task_name)
-    assert 'os' in task.dimensions, task.dimensions
+        'Triggered same task twice: %s' % task.request.name)
+    assert 'os' in task.request[0].dimensions, task.request[0].dimensions
 
     # There is a single pending task, regardless of how many shards get
     # triggered.
@@ -769,9 +785,18 @@
       pre_trigger_args: All arguments up to and including 'trigger'
       post_triggers_args: All arguments following 'trigger'
     """
+    task_request = task.request
+    task_slice = task.request[0]
+
     # Mix in standard infra packages 'vpython' and 'logdog' so that the task can
     # always access them on $PATH.
-    cipd_packages = list(task.cipd_packages or ())
+    task_cipd_packages = task_slice.cipd_ensure_file.packages
+    cipd_packages = []
+    if task_cipd_packages:
+      for path in sorted(task_cipd_packages):
+        for pkg in task_cipd_packages[path]:
+          cipd_packages.append(((path or '.'), pkg.name, pkg.version))
+
     for pkg in cipd_packages:
       assert not pkg[0].startswith(IMPLIED_BINARY_PATH), \
         'cipd_packages may not be installed to %r' % (IMPLIED_BINARY_PATH,)
@@ -780,7 +805,7 @@
 
     # HACK(crbug.com/842234) - we don't support cpython on mips yet, so remove
     # it from packages to inject.
-    cpu_dimension = task.dimensions.get('cpu', '')
+    cpu_dimension = task_slice.dimensions.get('cpu', '')
     if 'mips' in cpu_dimension:
       for k in to_add.keys():
         if 'cpython' in k:
@@ -801,7 +826,7 @@
     })
 
     # update $PATH
-    env_prefixes = dict(task.env_prefixes or {})            # copy it
+    env_prefixes = dict(task_slice.env_prefixes or {})            # copy it
     env_prefixes.setdefault('PATH', [])[:0] = sorted(  # prepend stuff
       path_env_prefix, key=lambda x: (len(x), x))
     for k, path in IMPLIED_ENV_PREFIXES.iteritems():
@@ -814,15 +839,15 @@
       '--swarming', self.swarming_server,
       '--isolate-server', self.m.isolate.isolate_server,
       '--namespace', self.m.isolate.namespace,
-      '--priority', str(task.priority),
+      '--priority', str(task_request.priority),
       '--task-name', task.task_name,
       '--dump-json', self.m.json.output(),
-      '--expiration', str(task.expiration),
-      '--io-timeout', str(task.io_timeout),
-      '--hard-timeout', str(task.hard_timeout),
+      '--expiration', str(task_slice.expiration_secs),
+      '--io-timeout', str(task_slice.io_timeout_secs),
+      '--hard-timeout', str(task_slice.execution_timeout_secs),
     ]
 
-    for name, value in sorted(task.dimensions.iteritems()):
+    for name, value in sorted(task_slice.dimensions.iteritems()):
       assert isinstance(value, basestring), \
         'dimension %s is not a string: %s' % (name, value)
       args.extend(['--dimension', name, value])
@@ -835,7 +860,7 @@
                 'optional-dimension %s is not a string: %s' % (name, value)
             args.extend(['--optional-dimension', name, value, exp])
 
-    for name, value in sorted(task.env.iteritems()):
+    for name, value in sorted(task_slice.env_vars.iteritems()):
       assert isinstance(value, basestring), \
         'env var %s is not a string: %s' % (name, value)
       args.extend(['--env', name, value])
@@ -843,8 +868,8 @@
     for name, relpath in sorted(named_caches.iteritems()):
       args.extend(['--named-cache', name, relpath])
 
-    if task.service_account:
-      args.extend(['--service-account', task.service_account])
+    if task_request.service_account:
+      args.extend(['--service-account', task_request.service_account])
 
     if self.service_account_json:
       args.extend(['--auth-service-account-json', self.service_account_json])
@@ -858,19 +883,24 @@
     # Default tags.
     tags = set(task.tags)
     tags.update(self._default_tags)
-    tags.add('data:' + task.isolated)
-    tags.add('name:' + task.name.split(' ')[0])
+
+    tags.add('data:' + task_slice.isolated)
+    tags.add('name:' + task_request.name.split(' ')[0])
     mastername = self.m.properties.get('mastername')
     if mastername:
       tags.add('master:' + mastername)
+
     if task.spec_name:
       tags.add('spec_name:' + task.spec_name)
-    if task.buildername:
-      tags.add('buildername:' + task.buildername)
-    if task.buildnumber:
-      tags.add('buildnumber:%s' % task.buildnumber)
+
+    if task.builder_info:
+      tags.add('buildername:' + task.builder_info[0])
+      if not task.builder_info[1] == -1:
+        tags.add('buildnumber:%s' % task.builder_info[1])
+
     if self.m.properties.get('bot_id'):
       tags.add('slavename:%s' % self.m.properties['bot_id'])
+
     tags.add('stepname:%s' % self.get_step_name('', task))
     for cl in self.m.buildbucket.build.input.gerrit_changes:
       tags.add('gerrit:https://%s/c/%s/%s' % (cl.host, cl.change, cl.patchset))
@@ -880,10 +910,10 @@
 
     if self.verbose:
       args.append('--verbose')
-    if task.idempotent:
+    if task_slice.idempotent:
       args.append('--idempotent')
-    if task.user:
-      args.extend(['--user', task.user])
+    if task_request.user:
+      args.extend(['--user', task_request.user])
 
     if cipd_packages:
       for path, pkg, version in cipd_packages:
@@ -895,18 +925,19 @@
           args.extend(('--env-prefix', key, path))
 
     # What isolated command to trigger.
-    args.extend(('--isolated', task.isolated))
+    if not task_slice.isolated == '0' * 40:
+      args.extend(('--isolated', task_slice.isolated))
 
     # Use a raw command as extra-args on tasks without command.
-    if task.raw_cmd:
+    if task_slice.command:
       # Allow using only one of raw_cmd or extra_args.
       assert not task.extra_args
       args.append('--raw-cmd')
 
     # Additional command line args for isolated command.
-    if task.extra_args or task.raw_cmd:
+    if task.extra_args or task_slice.command:
       args.append('--')
-      args.extend(task.extra_args or task.raw_cmd)
+      args.extend(task.extra_args or task_slice.command)
 
     script = self.m.swarming_client.path.join('swarming.py')
     if task.trigger_script:
@@ -1161,15 +1192,14 @@
                     # they do via expectations). Leave this here for now, since
                     # this is a sane default to ship with the module.
                     or self.resource('noop_merge.py'))
-    merge_args = (task.merge.get('args') or [])
 
+    merge_args = (task.merge.get('args') or [])
     task_args.extend([
       '--merge-script', merge_script,
       '--merge-script-stdout-file',
       self.m.raw_io.output('merge_script_log'),
       '--merge-additional-args', self.m.json.dumps(merge_args),
     ])
-
     if task.build_properties:
       properties = dict(task.build_properties)
       # exclude any recipe-engine-controlling properties (starting with $)
@@ -1217,7 +1247,6 @@
             ok_ret='any',
             step_test_data=gen_step_test_data,
             **kwargs)
-
     step_result.presentation.step_text = text_for_task(task)
 
     step_result.presentation.logs['Merge script log'] = [
@@ -1243,7 +1272,6 @@
 
     if exception and failure_as_exception:
       raise exception
-
     return step_result, has_valid_results
 
   def _check_for_missing_shard(self, merged_results_json, active_step, task):
@@ -1447,18 +1475,18 @@
       '[<prefix>] <task name> on <OS>'
     """
     prefix = '[%s] ' % prefix if prefix else ''
-    task_os = task.dimensions['os']
+    task_os = task.request[0].dimensions['os']
 
     bot_os = self.prefered_os_dimension(self.m.platform.name)
     suffix = ('' if (
         task_os == bot_os or task_os.lower() == self.m.platform.name.lower() or
-        task_os in task.name)
+        task_os in task.request.name)
               else ' on %s' % task_os)
     # Note: properly detecting dimensions of the bot the recipe is running
     # on is somewhat non-trivial. It is not safe to assume it uses default
     # or preferred dimensions for its OS. For example, the version of the OS
     # can differ.
-    return ''.join((prefix, task.name, suffix))
+    return ''.join((prefix, task.request.name, suffix))
 
 
   def _handle_summary_json(self, task, step_result):
@@ -1677,6 +1705,7 @@
     # Set platform-specific default dims.
     target_platform = self.m.chromium.c.TARGET_PLATFORM
     swarming_dims = PER_TARGET_SWARMING_DIMS[target_platform]
+
     for k, v in swarming_dims.iteritems():
       self.set_default_dimension(k, v)
 
@@ -1735,70 +1764,45 @@
 class SwarmingTask(object):
   """Definition of a task to run on swarming."""
 
-  def __init__(self, name, isolated, ignore_task_failure, dimensions,
-               env, priority, shards, shard_indices, spec_name, buildername,
-               buildnumber, expiration, user, io_timeout, hard_timeout,
-               idempotent, extra_args, collect_step, task_output_dir,
-               cipd_packages=None, build_properties=None, merge=None,
-               trigger_script=None, named_caches=None, service_account=None,
-               raw_cmd=None, env_prefixes=None, optional_dimensions=None,
-               task_to_retry=None, containment_type=None):
+  def __init__(self, request, collect_step, extra_args, ignore_task_failure,
+               shards, shard_indices, spec_name, task_output_dir,
+               build_properties=None, builder_info=None, containment_type=None,
+               merge=None, named_caches=None, optional_dimensions=None,
+               task_to_retry=None, trigger_script=None):
+
     """Configuration of a swarming task.
 
     Args:
-      * name: display name of the task, hints to what task is doing. Usually
-          corresponds to a name of a test executable. Doesn't have to be unique.
-      * isolated: hash of isolated file that describes all files needed to
-          run the task as well as command line to launch. See 'isolate' recipe
-          module.
-      * ignore_task_failure: whether to ignore the test failure of swarming
-          tasks.
-      * cipd_packages: list of 3-tuples corresponding to CIPD packages needed
-          for the task: ('path', 'package_name', 'version'), defined as follows:
-        * path: Path relative to the Swarming root dir in which to install
-            the package.
-        * package_name: Name of the package to install,
-            eg. "infra/tools/luci-auth/${platform}"
-        * version: Version of the package, either a package instance ID,
-            ref, or tag key/value pair.
-      * collect_step: callback that will be called to collect and processes
-          results of task execution, signature is collect_step(task, **kwargs).
-      * dimensions: key-value mapping with swarming dimensions that specify
-          on what Swarming slaves task can run. One important dimension is 'os',
-          which defines platform flavor to run the task on. See Swarming doc.
-      * env: key-value mapping with additional environment variables to add to
-          environment before launching the task executable.
-      * priority: integer [0, 255] that defines how urgent the task is.
-          Lower value corresponds to higher priority. Swarming service executes
-          tasks with higher priority first.
-      * shards: how many concurrent shards to run, makes sense only for
-          isolated tests based on gtest. Swarming uses GTEST_SHARD_INDEX
-          and GTEST_TOTAL_SHARDS environment variables to tell the executable
-          what shard to run.
-      * shard_indices: Which shards to run.
-      * spec_name: task spec name. Used in monitoring.
-      * buildername: buildbot builder this task was triggered from.
-      * buildnumber: build number of a build this task was triggered from.
-      * expiration: number of schedule until the task shouldn't even be run if
-          it hadn't started yet.
-      * user: user that requested this task, if applicable.
-      * io_timeout: number of seconds that the task is allowed to not emit any
-          stdout bytes, after which it is forcibly killed.
-      * hard_timeout: number of seconds for which the task is allowed to run,
-          after which it is forcibly killed.
-      * idempotent: True if the results from a previous task can be reused. E.g.
-          this task has no side-effects.
-      * extra_args: list of command line arguments to pass to isolated tasks.
-      * task_output_dir: if defined, the directory where task results are placed
-          during the collect step.
+      * request: swarming.TaskRequest instance as created by
+          swarming.task_request().
       * build_properties: An optional dict containing various build properties.
           These are typically but not necessarily the properties emitted by
           bot_update.
+      * builder_info: Information about the builder collected from buildbucket.
+        Usually composed of buildername and buildnumber.
+      * collect_step: callback that will be called to collect and processes
+          results of task execution. Expected signature is
+          collect_step(task, **kwargs).
+      * containment_type: string. Type of containment to use for the task. This
+          is being added to fix https://crbug.com/965222, please talk to
+          martiniss@ if you are using this feature; it should be deleted in the
+          next few months.
+      * extra_args: list of command line arguments to pass to isolated tasks.
+      * ignore_task_failure: whether to ignore the test failure of swarming
+          tasks.
       * merge: An optional dict containing:
         * "script": path to a script to call to post process and merge the
               collected outputs from the tasks.
         * "args": an optional list of additional arguments to pass to the
               above script.
+      * named_caches: a dict {name: relpath} requesting a cache named `name`
+          to be installed in `relpath` relative to the task root directory..
+      * spec_name: task spec name. Used in monitoring.
+      * task_output_dir: if defined, the directory where task results are placed
+          during the collect step.
+      * task_to_retry: Task object. If set, indicates that this task is a
+          (potentially partial) retry of another task. When collecting, should
+          re-use some shards from the retried task.
       * trigger_script: An optional dict containing:
         * "script": path to a script to call which will use custom logic to
               trigger appropriate swarming jobs, using swarming.py. Required.
@@ -1820,67 +1824,27 @@
           GTEST_TOTAL_SHARDS, which is the total number of shards.
           This can be done by passing `--env GTEST_SHARD_INDEX [NUM]` and
           `--env GTEST_SHARD_SHARDS [NUM]` when calling swarming.py trigger.
-      * named_caches: a dict {name: relpath} requesting a cache named `name`
-          to be installed in `relpath` relative to the task root directory.
-      * service_account: (string) a service account email to run the task under.
-      * raw_cmd: Optional list of arguments to be used as raw command. Can be
-          used instead of extra args.
-      * env_prefixes: a dict {ENVVAR: [relative, paths]} which instructs
-          swarming to prepend the given relative paths to the PATH-style ENVVAR
-          specified.
-      * optional_dimensions: {expiration: [{key: value]} mapping with swarming
-          dimensions that specify on what Swarming slaves tasks can run.  These
-          are similar to what is specified in dimensions but will create
-          additional 'fallback' task slice(s) with the optional dimensions.
-      * task_to_retry: Task object. If set, indicates that this task is a
-          (potentially partial) retry of another task. When collecting, should
-          re-use some shards from the retried task.
-      * containment_type: string. Type of containment to use for the task. This
-          is being added to fix https://crbug.com/965222, please talk to
-          martiniss@ if you are using this feature; it should be deleted in the
-          next few months.
     """
-
     self._trigger_output = None
     self.build_properties = build_properties
-    self.spec_name = spec_name
-    self.buildername = buildername
-    self.buildnumber = buildnumber
-    self.cipd_packages = cipd_packages
+    self.builder_info = builder_info
     self.collect_step = collect_step
     self.containment_type = containment_type
-    self.dimensions = dimensions.copy()
-    self.env = env.copy()
-    self.expiration = expiration
     self.extra_args = extra_args or []
-    self.hard_timeout = hard_timeout
-    self.idempotent = idempotent
+    self.failed_shards = []
     self.ignore_task_failure = ignore_task_failure
-    self.io_timeout = io_timeout
-    self.isolated = isolated
     self.merge = merge or {}
     self.named_caches = named_caches or {}
-    self.service_account = service_account
-    self.trigger_script = trigger_script or {}
-    self.priority = priority
-    self.raw_cmd = tuple(raw_cmd or [])
+    self.optional_dimensions = optional_dimensions
+    self.request = request
     self.shards = shards
     self.shard_indices = shard_indices
+    self.spec_name = spec_name
     self.tags = set()
     self.task_output_dir = task_output_dir
-    self.name = name
-    self.user = user
-    self.env_prefixes = {
-      var: list(paths) for var, paths in (env_prefixes or {}).iteritems()}
-    if optional_dimensions:
-      self.optional_dimensions = optional_dimensions.copy()
-    else:
-      self.optional_dimensions = None
-    self.wait_for_capacity = False
     self.task_to_retry = task_to_retry
-    # Specific shards which failed. Used to decide which shards to retry by
-    # clients.
-    self.failed_shards = []
+    self.trigger_script = trigger_script or {}
+    self.wait_for_capacity = False
 
   @property
   def task_name(self):
@@ -1889,12 +1853,17 @@
     The task name is purely to make sense of the task and is not used in any
     other way.
     """
-    out = '%s/%s/%s' % (
-        self.name, self.dimensions['os'], self.isolated[:10])
-    if self.buildername:
-      out += '/%s/%s' % (self.buildername, self.buildnumber or -1)
-    return out
+    task_name_suffix = ''
+    if self.builder_info:
+      task_name_suffix += '/%s/%s' % (
+        self.builder_info[0], self.builder_info[1])
 
+    return '%s/%s/%s%s' % (
+        self.request.name,
+        self.request[0].dimensions['os'],
+        self.request[0].isolated[:10],
+        task_name_suffix
+    )
   @property
   def trigger_output(self):
     """JSON results of 'trigger' step or None if not triggered.
@@ -1960,4 +1929,4 @@
     if self.trigger_output and self.trigger_output.get('tasks'):
       for shard_dict in self.trigger_output['tasks'].itervalues():
         task_ids.append(shard_dict['task_id'])
-    return task_ids
+    return task_ids
\ No newline at end of file
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/basic.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/basic.json
index 804bffb..470828b 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/basic.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/basic.json
@@ -345,9 +345,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -375,7 +372,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
@@ -450,9 +447,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--env",
@@ -480,7 +474,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
@@ -555,9 +549,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--env",
@@ -585,7 +576,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
@@ -660,9 +651,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--env",
@@ -690,7 +678,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/basic_luci.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/basic_luci.json
index f448a7d..092b21c 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/basic_luci.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/basic_luci.json
@@ -345,9 +345,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -375,7 +372,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
@@ -450,9 +447,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--env",
@@ -480,7 +474,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
@@ -555,9 +549,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--env",
@@ -585,7 +576,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
@@ -660,9 +651,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--env",
@@ -690,7 +678,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/basic_luci_experimental.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/basic_luci_experimental.json
index fbf752d..beea0cc 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/basic_luci_experimental.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/basic_luci_experimental.json
@@ -345,9 +345,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -375,7 +372,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
@@ -450,9 +447,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--env",
@@ -480,7 +474,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
@@ -555,9 +549,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--env",
@@ -585,7 +576,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
@@ -660,9 +651,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--env",
@@ -690,7 +678,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gerrit_trybot.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gerrit_trybot.json
index 4928b4a..1d27416 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gerrit_trybot.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gerrit_trybot.json
@@ -351,9 +351,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -389,7 +386,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_deduped_shard.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_deduped_shard.json
index a45e92d..64f69fa 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_deduped_shard.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_deduped_shard.json
@@ -311,9 +311,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--env",
@@ -416,9 +413,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--env",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_duration.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_duration.json
index 4f965a6..4ae309a 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_duration.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_duration.json
@@ -307,9 +307,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -337,7 +334,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_long_task.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_long_task.json
index 4e0e8d0..db0e087 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_long_task.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_long_task.json
@@ -307,9 +307,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -337,7 +334,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_many_failures.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_many_failures.json
index 2966d86..0e35df2 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_many_failures.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_many_failures.json
@@ -307,9 +307,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_null_shard.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_null_shard.json
index 7e2f63a..caa1a20 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_null_shard.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_null_shard.json
@@ -311,9 +311,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--env",
@@ -416,9 +413,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--env",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_outputs_ref.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_outputs_ref.json
index 83a2e1e..6e87936 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_outputs_ref.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/gtest_with_outputs_ref.json
@@ -307,9 +307,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -337,7 +334,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_large_outdir.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_large_outdir.json
index fc4408c..6337f36 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_large_outdir.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_large_outdir.json
@@ -307,9 +307,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -318,6 +315,9 @@
       "--env",
       "IS_SCRIPTTEST",
       "True",
+      "--env",
+      "TESTING",
+      "1",
       "--named-cache",
       "swarming_module_cache_vpython",
       ".swarming_module_cache/vpython",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_expired_new.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_expired_new.json
index 618e45d..d76e7ca 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_expired_new.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_expired_new.json
@@ -307,9 +307,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -318,6 +315,9 @@
       "--env",
       "IS_SCRIPTTEST",
       "True",
+      "--env",
+      "TESTING",
+      "1",
       "--named-cache",
       "swarming_module_cache_vpython",
       ".swarming_module_cache/vpython",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_non_zero_exit_status.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_non_zero_exit_status.json
index 71067b9..92cb2a1 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_non_zero_exit_status.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_non_zero_exit_status.json
@@ -307,9 +307,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -318,6 +315,9 @@
       "--env",
       "IS_SCRIPTTEST",
       "True",
+      "--env",
+      "TESTING",
+      "1",
       "--named-cache",
       "swarming_module_cache_vpython",
       ".swarming_module_cache/vpython",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_timeout_new.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_timeout_new.json
index d9adab5..78b1ecb 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_timeout_new.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_timeout_new.json
@@ -307,9 +307,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -318,6 +315,9 @@
       "--env",
       "IS_SCRIPTTEST",
       "True",
+      "--env",
+      "TESTING",
+      "1",
       "--named-cache",
       "swarming_module_cache_vpython",
       ".swarming_module_cache/vpython",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_custom_merge.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_custom_merge.json
index 8f35c64..18b77cd 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_custom_merge.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_custom_merge.json
@@ -307,9 +307,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -318,6 +315,9 @@
       "--env",
       "IS_SCRIPTTEST",
       "True",
+      "--env",
+      "TESTING",
+      "1",
       "--named-cache",
       "swarming_module_cache_vpython",
       ".swarming_module_cache/vpython",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_custom_trigger_script.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_custom_trigger_script.json
index 50984d8..2a40730 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_custom_trigger_script.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_custom_trigger_script.json
@@ -31,9 +31,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -42,6 +39,9 @@
       "--env",
       "IS_SCRIPTTEST",
       "True",
+      "--env",
+      "TESTING",
+      "1",
       "--named-cache",
       "swarming_module_cache_vpython",
       ".swarming_module_cache/vpython",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_null_shard.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_null_shard.json
index fc73c6f..98f9471 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_null_shard.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/isolated_script_with_null_shard.json
@@ -311,9 +311,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--env",
@@ -322,6 +319,9 @@
       "--env",
       "IS_SCRIPTTEST",
       "True",
+      "--env",
+      "TESTING",
+      "1",
       "--named-cache",
       "swarming_module_cache_vpython",
       ".swarming_module_cache/vpython",
@@ -420,9 +420,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--env",
@@ -431,6 +428,9 @@
       "--env",
       "IS_SCRIPTTEST",
       "True",
+      "--env",
+      "TESTING",
+      "1",
       "--named-cache",
       "swarming_module_cache_vpython",
       ".swarming_module_cache/vpython",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/named_caches.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/named_caches.json
index eb03d8a..fbc607a 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/named_caches.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/named_caches.json
@@ -311,9 +311,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--env",
@@ -347,7 +344,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/service_account.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/service_account.json
index 352706e..a3e9107 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/service_account.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/service_account.json
@@ -345,9 +345,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -377,7 +374,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
@@ -452,9 +449,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--env",
@@ -484,7 +478,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
@@ -559,9 +553,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--env",
@@ -591,7 +582,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
@@ -666,9 +657,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--env",
@@ -698,7 +686,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/show_outputs_ref_in_collect_step.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/show_outputs_ref_in_collect_step.json
index ee4a69a..e724e8f 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/show_outputs_ref_in_collect_step.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/show_outputs_ref_in_collect_step.json
@@ -307,9 +307,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -337,7 +334,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/show_shards_in_collect_step.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/show_shards_in_collect_step.json
index 6cda6d3..17b76a3 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/show_shards_in_collect_step.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/show_shards_in_collect_step.json
@@ -307,9 +307,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -337,7 +334,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/swarming_expired_new.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/swarming_expired_new.json
index 06f2f0c..28b93be 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/swarming_expired_new.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/swarming_expired_new.json
@@ -307,9 +307,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -337,7 +334,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/swarming_timeout_new.json b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/swarming_timeout_new.json
index 596af69..07050fc 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/swarming_timeout_new.json
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.expected/swarming_timeout_new.json
@@ -307,9 +307,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--env",
@@ -337,7 +334,7 @@
       "--user",
       "joe",
       "--cipd-package",
-      ":cool/package:vers",
+      ".:cool/package:vers",
       "--cipd-package",
       "bin:super/awesome/pkg:git_revision:deadbeef",
       "--cipd-package",
diff --git a/scripts/slave/recipe_modules/chromium_swarming/examples/full.py b/scripts/slave/recipe_modules/chromium_swarming/examples/full.py
index c8bc268..8c93f92 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/examples/full.py
+++ b/scripts/slave/recipe_modules/chromium_swarming/examples/full.py
@@ -120,13 +120,18 @@
           merge=merge)
     elif isolated_script_task:
       task = api.chromium_swarming.isolated_script_task()
-      task.name = 'hello_world'
-      task.isolated = isolated
+      task_request = task.request
+      task_slice = task_request[0]
+
+      task_slice = (task_slice.with_isolated(isolated).
+                    with_env_vars(**{'IS_GTEST': '', 'IS_SCRIPTTEST': 'True'}))
+      task.request = (task_request.with_slice(0, task_slice).
+                                  with_name('hello_world'))
+
       task.task_output_dir = temp_dir.join('task_output_dir')
       if merge:
         task.merge = merge
       task.trigger_script = trigger_script
-      task.env = {'IS_GTEST': '', 'IS_SCRIPTTEST': 'True'}
     else:
       task = api.chromium_swarming.task(name='hello_world', isolated=isolated,
                               task_output_dir=temp_dir.join('task_output_dir'),
@@ -135,8 +140,7 @@
                               cipd_packages=[
                                 ('', 'cool/package', 'vers'),
                               ])
-    task.dimensions['os'] = api.chromium_swarming.prefered_os_dimension(
-        platform)
+
     if platform == 'linux':
       task.shards = 2
       task.shard_indices = range(task.shards)
@@ -148,10 +152,20 @@
       task.shard_indices = [0]
     if custom_trigger_script:
       task.trigger_script = {'script': 'custom_trigger.py'}
+
+    task_request = task.request
+    task_slice = task_request[0]
+    task_dimensions = task_slice.dimensions
+    task_dimensions['os'] = api.chromium_swarming.prefered_os_dimension(
+        platform)
     task.tags.add('os:' + platform)
+    ensure_file = task_slice.cipd_ensure_file
     if api.swarming_client.get_script_version('swarming.py') >= (0, 8, 6):
-      task.cipd_packages.append(
-        ('bin', 'super/awesome/pkg', 'git_revision:deadbeef'))
+      ensure_file.add_package('super/awesome/pkg', 'git_revision:deadbeef',
+                              'bin')
+    task_slice = (task_slice.with_dimensions(**task_dimensions).
+                    with_cipd_ensure_file(ensure_file))
+    task.request = task_request.with_slice(0, task_slice)
     tasks.append(task)
 
   # Launch all tasks.
diff --git a/scripts/slave/recipe_modules/chromium_swarming/tests/shards_to_retry.py b/scripts/slave/recipe_modules/chromium_swarming/tests/shards_to_retry.py
index 7901500..e8f3795 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/tests/shards_to_retry.py
+++ b/scripts/slave/recipe_modules/chromium_swarming/tests/shards_to_retry.py
@@ -28,7 +28,9 @@
       def __init__(self):
         self.trigger_output = task_to_retry
     kwargs['task_to_retry'] = FakeTask()
-  task = api.chromium_swarming.task('test-task', '00deadbeef00', **kwargs)
+  task = api.chromium_swarming.task(name='test-task',
+                                    isolated='00deadbeef00',
+                                    **kwargs)
   task._trigger_output = {
       'tasks': {
         0: {
diff --git a/scripts/slave/recipe_modules/chromium_swarming/tests/task.py b/scripts/slave/recipe_modules/chromium_swarming/tests/task.py
index 776f611..868e99f 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/tests/task.py
+++ b/scripts/slave/recipe_modules/chromium_swarming/tests/task.py
@@ -14,13 +14,19 @@
 def RunSteps(api):
   opt_dims = {60: [{'os': 'Ubuntu-14.04'}]}
   task = api.chromium_swarming.task(
-      api.properties.get('task_name', 'sample_task'),
-      '0123456789012345678901234567890123456789',
+      name=api.properties.get('task_name', 'sample_task'),
+      isolated='0123456789012345678901234567890123456789',
       optional_dimensions=opt_dims)
-  task.dimensions['os'] = api.chromium_swarming.prefered_os_dimension(
-      api.platform.name)
   if api.properties.get('wait_for_capacity'):
     task.wait_for_capacity = True
+
+  task_slice = task.request[0]
+  task_dimensions = task_slice.dimensions
+  task_dimensions['os'] = api.chromium_swarming.prefered_os_dimension(
+      api.platform.name)
+  task_slice = task_slice.with_dimensions(**task_dimensions)
+  task.request = task.request.with_slice(0, task_slice)
+
   if api.properties.get('containment_type'):
     task.containment_type = api.properties['containment_type']
   api.chromium_swarming.trigger_task(task)
diff --git a/scripts/slave/recipe_modules/chromium_swarming/tests/trigger_output.py b/scripts/slave/recipe_modules/chromium_swarming/tests/trigger_output.py
index ef99cf4..a3ddc61 100644
--- a/scripts/slave/recipe_modules/chromium_swarming/tests/trigger_output.py
+++ b/scripts/slave/recipe_modules/chromium_swarming/tests/trigger_output.py
@@ -28,7 +28,9 @@
       def __init__(self):
         self.trigger_output = task_to_retry
     kwargs['task_to_retry'] = FakeTask()
-  task = api.chromium_swarming.task('test-task', '00deadbeef00', **kwargs)
+  task = api.chromium_swarming.task(name='test-task',
+                                    isolated='00deadbeef00',
+                                    **kwargs)
   task._trigger_output = {
       'tasks': {
         '0': {
diff --git a/scripts/slave/recipe_modules/chromium_tests/steps.py b/scripts/slave/recipe_modules/chromium_tests/steps.py
index 755a239..8d73d3b 100644
--- a/scripts/slave/recipe_modules/chromium_tests/steps.py
+++ b/scripts/slave/recipe_modules/chromium_tests/steps.py
@@ -1018,6 +1018,7 @@
       args = _merge_arg(args, '--gtest_filter', ':'.join(tests_to_retry))
 
     gtest_results_file = api.test_utils.gtest_results(add_json_log=False)
+
     step_test_data = lambda: api.test_utils.test_api.canned_gtest_output(True)
 
     kwargs = {
@@ -1185,7 +1186,8 @@
 
     chrome_revision_cp = api.bot_update.last_returned_properties.get(
         'got_revision_cp', 'refs/x@{#0}')
-    _, chrome_revision = api.commit_position.parse(chrome_revision_cp)
+
+    _, chrome_revision = api.commit_position.parse(str(chrome_revision_cp))
     chrome_revision = str(chrome_revision)
     api.test_results.upload(
       api.json.input(results), chrome_revision=chrome_revision,
@@ -1545,15 +1547,18 @@
     task.extra_args.extend(args)
     task.shards = shards
 
+    task_request = task.request
+    task_slice = task_request[0]
+
     if self._isolate_coverage_data:
       # Targets built with 'use_clang_coverage' will look at this environment
       # variable to determine where to write the profile dumps. The %Nm syntax
       # is understood by this instrumentation, see:
       #   https://clang.llvm.org/docs/SourceBasedCodeCoverage.html#id4
-      task.env = {
+      task_slice = task_slice.with_env_vars(**{
           'LLVM_PROFILE_FILE':
               '${ISOLATED_OUTDIR}/profraw/default-%8m.profraw',
-      }
+      })
 
       # Wrap the merge script specific to the test type (i.e. gtest vs isolated
       # script tests) in a coverage that know how to merge coverage data. If the
@@ -1569,7 +1574,7 @@
           '\'retry_shards_with_patch\' expects that the \'with patch\' phase '
           'has already run, but it apparently hasn\'t.')
       task.shard_indices = task.task_to_retry.failed_shards
-      task.idempotent = False
+      task_slice = task_slice.with_idempotent(False)
       # Test suite failure is determined by merging and examining the JSON
       # output from the shards. Failed shards are determined by looking at the
       # swarming output [retcode !=0 or state != 'SUCCESS']. It is possible that
@@ -1589,47 +1594,52 @@
       task.shard_indices = range(task.shards)
 
     task.build_properties = api.chromium.build_properties
-    task.cipd_packages = self._cipd_packages
     task.containment_type = self._containment_type
     task.ignore_task_failure = self._ignore_task_failure
-    task.isolated = isolated
     if self._merge:
       task.merge = self._merge
-    task.name = self.step_name(suffix)
+
     task.trigger_script = self._trigger_script
-    task.service_account = self._service_account
+
+    ensure_file = task_slice.cipd_ensure_file
+    if self._cipd_packages:
+      for package in self._cipd_packages:
+        ensure_file.add_package(package[1], package[2], package[0])
+
+    task_slice = (task_slice.with_cipd_ensure_file(ensure_file).
+                   with_isolated(isolated))
 
     if suffix in self.SUFFIXES_TO_INCREASE_PRIORITY:
-      task.priority -= 1
+      task_request = task_request.with_priority(task_request.priority - 1)
 
     if self._expiration:
-      task.expiration = self._expiration
+      task_slice = task_slice.with_expiration_secs(self._expiration)
 
     if self._hard_timeout:
-      task.hard_timeout = self._hard_timeout
+      task_slice = task_slice.with_execution_timeout_secs(self._hard_timeout)
 
     if self._io_timeout:
-      task.io_timeout = self._io_timeout
+      task_slice = task_slice.with_io_timeout_secs(self._io_timeout)
 
+    task_dimensions = task_slice.dimensions
     # Add custom dimensions.
     if self._dimensions:  # pragma: no cover
       #TODO(stip): concoct a test case that will trigger this codepath
       for k, v in self._dimensions.iteritems():
-         if v is None:
-           # Remove key if it exists. This allows one to use None to remove
-           # default dimensions.
-           task.dimensions.pop(k, None)
-         else:
-           task.dimensions[k] = v
+        task_dimensions[k] = v
+    # Set default value.
+    if 'os' not in task_dimensions:
+      task_dimensions['os'] = api.chromium_swarming.prefered_os_dimension(
+          api.platform.name)
+    task_slice = task_slice.with_dimensions(**task_dimensions)
 
     # Add optional dimensions.
-    if self._optional_dimensions:
-        task.optional_dimensions = self._optional_dimensions
+    task.optional_dimensions = self._optional_dimensions or None
 
-    # Set default value.
-    if 'os' not in task.dimensions:
-      task.dimensions['os'] = api.chromium_swarming.prefered_os_dimension(
-          api.platform.name)
+    task.request = (task_request.with_slice(0, task_slice).
+                      with_name(self.step_name(suffix)).
+                      with_service_account(self._service_account or ''))
+    return task
 
   def get_task(self, suffix):
     return self._tasks.get(suffix)
@@ -1716,7 +1726,7 @@
       data['full_step_name'] = self._suffix_step_name_map[suffix]
       data['patched'] = suffix in (
           'with patch', 'retry shards with patch')
-      data['dimensions'] = self._tasks[suffix].dimensions
+      data['dimensions'] = self._tasks[suffix].request[0].dimensions
       data['swarm_task_ids'] = self._tasks[suffix].get_task_ids()
     return data
 
@@ -1988,7 +1998,9 @@
     # idempotent TODO(crbug.com/549140): remove the self._idempotent
     # parameter once Telemetry tests are idempotent, since that will make all
     # isolated_script_tests idempotent.
-    task.idempotent = self._idempotent
+    task_slice = task.request[0]
+    task_slice = task_slice.with_idempotent(self._idempotent)
+    task.request = task.request.with_slice(0, task_slice)
 
     self._apply_swarming_task_config(
         task, api, suffix, isolated, '--isolated-script-test-filter', '::')
@@ -2000,6 +2012,7 @@
     test_run_dictionary = (
         self.results_handler.validate_results(api, results_json))
     presentation = step_result.presentation
+
     test_results = api.test_utils.create_results_from_json(results_json)
     self.results_handler.render_results(api, test_results, presentation)
 
@@ -2058,7 +2071,6 @@
     self._suffix_step_name_map[suffix] = step_result.step['name']
     test_results = step_result.test_utils.test_results
     presentation = step_result.presentation
-
     if (test_results.valid and
         step_result.retcode <= api.test_utils.MAX_FAILURES_EXIT_STATUS):
       self.update_test_run(
@@ -2571,7 +2583,6 @@
           replay_package_version,
       ))
     self._cipd_packages = cipd_packages
-
     self._expiration = (self._task['test'].get('expiration_time') or
                         self._config.get( 'expiration_time'))
 
@@ -2632,20 +2643,25 @@
     self._apply_swarming_task_config(
         swarming_task, api, suffix, task['isolated hash'], filter_flag=None,
         filter_delimiter=None)
-    swarming_task.priority = task['test'].get('priority', 200)
 
-    assert task.get('xcode build version')
-    named_cache = 'xcode_ios_%s' % (task['xcode build version'])
-    swarming_task.named_caches[named_cache] = api.ios.XCODE_APP_PATH
+    task_slice = swarming_task.request[0]
 
     # The implementation of _apply_swarming_task_config picks up default
     # dimensions which don't work for iOS because the swarming bots do not
     # specify typical dimensions [GPU, cpu type]. We explicitly override
     # dimensions here to get the desired results.
-    swarming_task.dimensions = self._dimensions
+    task_slice = task_slice.with_dimensions(**self._dimensions)
+    swarming_task.request = (swarming_task.request.
+                              with_slice(0, task_slice).
+                              with_priority(task['test'].get('priority', 200)))
+
     if self._platform == 'device' and self._config.get('device check'):
       swarming_task.wait_for_capacity = True
 
+    assert task.get('xcode build version')
+    named_cache = 'xcode_ios_%s' % (task['xcode build version'])
+    swarming_task.named_caches[named_cache] = api.ios.XCODE_APP_PATH
+
     swarming_task.tags.add(
         'device_type:%s' % str(task['test']['device type']))
     swarming_task.tags.add('ios_version:%s' % str(task['test']['os']))
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/api/trybot_steps_with_specific_tests.expected/basic.json b/scripts/slave/recipe_modules/chromium_tests/tests/api/trybot_steps_with_specific_tests.expected/basic.json
index 0a250f2..448ef14 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/api/trybot_steps_with_specific_tests.expected/basic.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/api/trybot_steps_with_specific_tests.expected/basic.json
@@ -360,9 +360,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -560,7 +557,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -1205,9 +1201,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1367,7 +1360,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/api/trybot_steps_with_specific_tests.expected/disable_deapply_patch_affected_files.json b/scripts/slave/recipe_modules/chromium_tests/tests/api/trybot_steps_with_specific_tests.expected/disable_deapply_patch_affected_files.json
index dbfab6c..a66cac2 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/api/trybot_steps_with_specific_tests.expected/disable_deapply_patch_affected_files.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/api/trybot_steps_with_specific_tests.expected/disable_deapply_patch_affected_files.json
@@ -360,9 +360,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -560,7 +557,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/api/trybot_steps_with_specific_tests.expected/nonzero_exit_code_no_gtest_output.json b/scripts/slave/recipe_modules/chromium_tests/tests/api/trybot_steps_with_specific_tests.expected/nonzero_exit_code_no_gtest_output.json
index 5a5f1b4..d2cf036 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/api/trybot_steps_with_specific_tests.expected/nonzero_exit_code_no_gtest_output.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/api/trybot_steps_with_specific_tests.expected/nonzero_exit_code_no_gtest_output.json
@@ -360,9 +360,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -550,7 +547,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/merge.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/merge.json
index 8a54f31..d03199c 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/merge.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/merge.json
@@ -190,9 +190,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--named-cache",
@@ -363,7 +360,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"full_step_name\": \"base_unittests\", @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/swarming.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/swarming.json
index b89acc2..a08a917 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/swarming.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/swarming.json
@@ -190,9 +190,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Linux",
       "--named-cache",
@@ -365,7 +362,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Linux\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"full_step_name\": \"base_unittests\", @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/swarming_plus_optional_dimension.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/swarming_plus_optional_dimension.json
index 2d2774e..5accf8c 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/swarming_plus_optional_dimension.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/swarming_plus_optional_dimension.json
@@ -190,9 +190,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Linux",
       "--optional-dimension",
@@ -369,7 +366,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Linux\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"full_step_name\": \"base_unittests\", @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/trigger_script.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/trigger_script.json
index 385f03f..eb330a6 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/trigger_script.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/trigger_script.json
@@ -190,9 +190,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--named-cache",
@@ -363,7 +360,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"full_step_name\": \"base_unittests\", @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/trigger_script_simultaneous_shard_dispatch.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/trigger_script_simultaneous_shard_dispatch.json
index 5355274..9ef7de6 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/trigger_script_simultaneous_shard_dispatch.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_gtest.expected/trigger_script_simultaneous_shard_dispatch.json
@@ -29,9 +29,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--named-cache",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/custom_webkit_tests_step_name.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/custom_webkit_tests_step_name.json
index d967ecd..111d2c1 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/custom_webkit_tests_step_name.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/custom_webkit_tests_step_name.json
@@ -190,9 +190,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--named-cache",
@@ -386,7 +383,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"custom_webkit_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"full_step_name\": \"custom_webkit_tests\", @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/fake_results_handler.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/fake_results_handler.json
index ab11b33..30a7918 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/fake_results_handler.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/fake_results_handler.json
@@ -190,9 +190,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--named-cache",
@@ -380,7 +377,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"full_step_name\": \"base_unittests\", @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/swarming.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/swarming.json
index 4f05384..27e3d59 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/swarming.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/swarming.json
@@ -190,9 +190,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--named-cache",
@@ -386,7 +383,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"full_step_name\": \"base_unittests\", @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/swarming_dimension_sets.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/swarming_dimension_sets.json
index f4af0f0..9221e6e 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/swarming_dimension_sets.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/swarming_dimension_sets.json
@@ -190,9 +190,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Linux",
       "--named-cache",
@@ -386,7 +383,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Linux\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"full_step_name\": \"base_unittests\", @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/swarming_dimension_sets_plus_optional.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/swarming_dimension_sets_plus_optional.json
index 6352586..1269419 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/swarming_dimension_sets_plus_optional.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/swarming_dimension_sets_plus_optional.json
@@ -190,9 +190,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Linux",
       "--optional-dimension",
@@ -390,7 +387,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Linux\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"full_step_name\": \"base_unittests\", @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/swarming_trigger_script.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/swarming_trigger_script.json
index 3a64f05..57e6ed9 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/swarming_trigger_script.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/generate_isolated_script.expected/swarming_trigger_script.json
@@ -190,9 +190,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--named-cache",
@@ -386,7 +383,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"full_step_name\": \"base_unittests\", @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_gtest_test.expected/android.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_gtest_test.expected/android.json
index 27d4320..9a51f05 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_gtest_test.expected/android.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_gtest_test.expected/android.json
@@ -29,9 +29,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--named-cache",
@@ -200,7 +197,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"full_step_name\": \"base_unittests\", @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_gtest_test.expected/basic.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_gtest_test.expected/basic.json
index 790046b..1236409 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_gtest_test.expected/basic.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_gtest_test.expected/basic.json
@@ -29,9 +29,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--named-cache",
@@ -200,7 +197,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"full_step_name\": \"base_unittests\", @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_gtest_test.expected/no_result_json.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_gtest_test.expected/no_result_json.json
index 9d2bea5..5d4b180 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_gtest_test.expected/no_result_json.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_gtest_test.expected/no_result_json.json
@@ -29,9 +29,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--named-cache",
@@ -200,7 +197,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"full_step_name\": \"base_unittests\", @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_gtest_test.expected/overrides.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_gtest_test.expected/overrides.json
index 259c0e2..bdf6bc4 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_gtest_test.expected/overrides.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_gtest_test.expected/overrides.json
@@ -29,9 +29,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--named-cache",
@@ -200,7 +197,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"base_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"full_step_name\": \"base_unittests\", @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/basic.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/basic.json
index 8e52da3..9f6fbf5 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/basic.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/basic.json
@@ -409,7 +409,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/basic_luci.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/basic_luci.json
index b9d6c59..aaa025a 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/basic_luci.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/basic_luci.json
@@ -411,7 +411,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildbucket\": \"{\\\"build\\\": {\\\"project\\\": \\\"chromium\\\", \\\"bucket\\\": \\\"try\\\", \\\"tags\\\": [\\\"builder:Linux Tests\\\"]}}\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildbucket\": \"{\\\"build\\\": {\\\"project\\\": \\\"chromium\\\", \\\"bucket\\\": \\\"try\\\", \\\"tags\\\": [\\\"builder:Linux Tests\\\"]}}\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson.json
index 0546128..c4d4e3e 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson.json
@@ -409,7 +409,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_disabled.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_disabled.json
index f2eff94..6f03db3 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_disabled.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_disabled.json
@@ -409,7 +409,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_ignore_task_failure.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_ignore_task_failure.json
index 6c7020c..cbe8575 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_ignore_task_failure.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_ignore_task_failure.json
@@ -409,7 +409,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"ignore_task_failure\": true, \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"ignore_task_failure\": true, \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_invalid.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_invalid.json
index f2c97cf..dd6bf67 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_invalid.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_invalid.json
@@ -409,7 +409,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_max_failures.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_max_failures.json
index 0546128..c4d4e3e 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_max_failures.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_max_failures.json
@@ -409,7 +409,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_no_results.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_no_results.json
index 16899c3..5d714c7 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_no_results.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_no_results.json
@@ -409,7 +409,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_no_results_failure.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_no_results_failure.json
index b964dd4..76d96d5 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_no_results_failure.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_no_results_failure.json
@@ -409,7 +409,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_not_uploading.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_not_uploading.json
index 71df5be..2177887 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_not_uploading.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_not_uploading.json
@@ -409,7 +409,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_simplified_disabled.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_simplified_disabled.json
index d7fcaa9..08e293a 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_simplified_disabled.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_simplified_disabled.json
@@ -409,7 +409,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_simplified_ignore_task_failure.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_simplified_ignore_task_failure.json
index 3443262..0fb298e 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_simplified_ignore_task_failure.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/chartjson_simplified_ignore_task_failure.json
@@ -409,7 +409,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"ignore_task_failure\": true, \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"ignore_task_failure\": true, \"mastername\": \"chromium.linux\", \"perf_id\": \"test-perf-id\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"results_url\": \"https://example/url\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/dimensions_android.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/dimensions_android.json
index 2573c97..cb230c2 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/dimensions_android.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/dimensions_android.json
@@ -297,9 +297,6 @@
       "device_type",
       "hammerhead",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Android",
       "--named-cache",
@@ -417,7 +414,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Lollipop Phone Tester\", \"buildnumber\": 123, \"dimensions\": {\"device_os\": \"LOL123\", \"device_type\": \"hammerhead\", \"os\": \"Android\"}, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.android\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Lollipop Phone Tester\", \"buildnumber\": 123, \"dimensions\": {\"device_os\": \"LOL123\", \"device_type\": \"hammerhead\", \"os\": \"Android\"}, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.android\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
@@ -499,7 +496,6 @@
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"device_os\": \"LOL123\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"device_type\": \"hammerhead\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Android\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"full_step_name\": \"base_unittests on Android device Nexus 5 (with patch)\", @@@",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/dimensions_mac.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/dimensions_mac.json
index 7337aaf..150e20a 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/dimensions_mac.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/dimensions_mac.json
@@ -409,7 +409,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"dimensions\": {\"gpu\": \"8086\", \"os\": \"Mac\"}, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"dimensions\": {\"gpu\": \"8086\", \"os\": \"Mac\"}, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/dimensions_mac_hidpi.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/dimensions_mac_hidpi.json
index 5581c7f..d8eb923 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/dimensions_mac_hidpi.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/dimensions_mac_hidpi.json
@@ -412,7 +412,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"dimensions\": {\"gpu\": \"8086\", \"hidpi\": \"1\", \"os\": \"Mac\"}, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"dimensions\": {\"gpu\": \"8086\", \"hidpi\": \"1\", \"os\": \"Mac\"}, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/dimensions_windows.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/dimensions_windows.json
index fd1f4bf..de0cafc 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/dimensions_windows.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/dimensions_windows.json
@@ -409,7 +409,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"dimensions\": {\"gpu\": \"8086\", \"os\": \"Windows\"}, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"dimensions\": {\"gpu\": \"8086\", \"os\": \"Windows\"}, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/override_compile_targets.json b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/override_compile_targets.json
index 688d505..6985e10 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/override_compile_targets.json
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.expected/override_compile_targets.json
@@ -409,7 +409,7 @@
       "--merge-additional-args",
       "[]",
       "--build-properties",
-      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": 123456, \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"override_compile_targets\": [\"base_unittests_run\"], \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+      "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"bot_id\": \"test_bot\", \"buildbotURL\": \"http://c.org/p/cr/\", \"buildername\": \"Linux Tests\", \"buildnumber\": 123, \"git_revision\": \"test_sha\", \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_dawn_revision\": \"1b5c932bc9a9a35c66edea3914fb675742d57cc2\", \"got_dawn_revision_cp\": \"refs/heads/master@{#51819}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#123456}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\", \"mastername\": \"chromium.linux\", \"override_compile_targets\": [\"base_unittests_run\"], \"recipe\": \"chromium_tests:tests/steps/swarming_isolated_script_test\", \"slavename\": \"TestSlavename\", \"swarm_hashes\": {\"base_unittests\": \"ffffffffffffffffffffffffffffffffffffffff\"}, \"version\": \"test-version\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
       "--summary-json-file",
       "/path/to/tmp/json",
       "--",
diff --git a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.py b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.py
index b561eaa..3877bbd 100644
--- a/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.py
+++ b/scripts/slave/recipe_modules/chromium_tests/tests/steps/swarming_isolated_script_test.py
@@ -49,7 +49,7 @@
   test_name = 'blink_web_tests' if test_repeat_count else 'base_unittests'
   isolate_coverage_data = api.properties.get('isolate_coverage_data', False)
   test = api.chromium_tests.steps.SwarmingIsolatedScriptTest(
-      test_name,
+      name=test_name,
       perf_id=api.properties.get('perf_id'),
       perf_dashboard_id='test-perf-dashboard-id',
       results_url=api.properties.get('results_url'),
@@ -134,7 +134,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456)
+          got_revision_cp='refs/heads/master@{#123456}')
   )
 
   yield (
@@ -149,7 +149,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           isolate_coverage_data=True,
       ) +
       api.post_process(verify_isolate_flag) +
@@ -168,7 +168,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456) +
+          got_revision_cp='refs/heads/master@{#123456}') +
       api.step_data(
           '[trigger] base_unittests on Intel GPU on Linux (with patch)',
           retcode=1) +
@@ -190,7 +190,7 @@
           version='test-version',
           shards=20,
           run_without_patch=True,
-          got_revision_cp=123456) +
+          got_revision_cp='refs/heads/master@{#123456}') +
       api.step_data(
           '[trigger] base_unittests on Intel GPU on Linux (with patch)',
           retcode=1, ) +
@@ -208,7 +208,7 @@
           buildnumber=123,
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456) +
+          got_revision_cp='refs/heads/master@{#123456}') +
       api.post_process(post_process.StatusFailure) +
       api.post_process(post_process.DropExpectation)
   )
@@ -231,7 +231,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456)
+          got_revision_cp='refs/heads/master@{#123456}')
   )
 
   isolated_script_output = api.test_utils.canned_isolated_script_output(
@@ -250,7 +250,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           run_without_patch='a') +
       api.override_step_data(
           'base_unittests on Intel GPU on Linux (with patch)',
@@ -306,7 +306,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           test_filter=['test1', 'test2'],
           repeat_count=20) +
       api.override_step_data(
@@ -343,7 +343,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           test_filter=['test1', 'test2'],
           repeat_count=20) +
       api.post_process(
@@ -376,7 +376,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           override_compile_targets=['base_unittests_run'])
   )
 
@@ -392,7 +392,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           perf_id='test-perf-id',
           results_url='https://example/url') +
       api.override_step_data(
@@ -419,7 +419,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           perf_id='test-perf-id',
           results_url='https://example/url',
           ignore_task_failure=True) +
@@ -444,7 +444,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           perf_id='test-perf-id',
           results_url='https://example/url',
           ignore_task_failure=True) +
@@ -471,7 +471,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           perf_id='test-perf-id',
           results_url='https://example/url') +
       api.override_step_data(
@@ -496,7 +496,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           perf_id='test-perf-id',
           results_url='https://example/url') +
       api.override_step_data(
@@ -521,7 +521,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           perf_id='test-perf-id',
           results_url='https://example/url')
   )
@@ -538,7 +538,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           perf_id='test-perf-id',
           results_url='https://example/url') +
       api.override_step_data(
@@ -559,7 +559,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456) +
+          got_revision_cp='refs/heads/master@{#123456}') +
       api.override_step_data(
           'base_unittests on Intel GPU on Linux (with patch)',
           api.chromium_swarming.canned_summary_output(
@@ -581,7 +581,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           perf_id='test-perf-id',
           results_url='https://example/url') +
       api.override_step_data(
@@ -609,7 +609,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           perf_id='test-perf-id',
           results_url='https://example/url') +
       api.override_step_data(
@@ -693,7 +693,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           dimensions={'gpu': '8086', 'os': 'Windows'})
   )
 
@@ -709,7 +709,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           dimensions={'gpu': '8086', 'os': 'Mac'})
   )
 
@@ -725,7 +725,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           dimensions={'gpu': '8086', 'os': 'Mac', 'hidpi': '1'})
   )
 
@@ -741,7 +741,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           dimensions={
               'device_type': 'hammerhead',
               'device_os': 'LOL123',
@@ -762,7 +762,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           test_filter=['test1', 'test2'],
           repeat_count=20) +
       api.override_step_data(
@@ -785,7 +785,7 @@
           },
           git_revision='test_sha',
           version='test-version',
-          got_revision_cp=123456,
+          got_revision_cp='refs/heads/master@{#123456}',
           test_filter=['test1', 'test2'],
           repeat_count=20) +
       api.override_step_data(
diff --git a/scripts/slave/recipe_modules/dart/api.py b/scripts/slave/recipe_modules/dart/api.py
index 136f6ce..b89ea2d 100644
--- a/scripts/slave/recipe_modules/dart/api.py
+++ b/scripts/slave/recipe_modules/dart/api.py
@@ -172,10 +172,11 @@
     for shard in range(num_shards):
       if last_shard_is_local and shard == num_shards - 1:
         break
-      task = self.m.chromium_swarming.task('%s_shard_%s' % (name, (shard + 1)),
-                                  isolate_hash,
+      task = self.m.chromium_swarming.task(
+                                  name='%s_shard_%s' % (name, (shard + 1)),
+                                  isolated=isolate_hash,
                                   cipd_packages=cipd_packages,
-                                  raw_cmd=test_args +
+                                  raw_cmd= (test_args or []) +
                                   ['--shards=%s' % num_shards,
                                    '--shard=%s' % (shard + 1),
                                    '--output-directory=${ISOLATED_OUTDIR}'],
@@ -186,14 +187,22 @@
         'mac': 'Mac',
         'win': 'Windows',
       }
-      task.dimensions['os'] = os_names.get(os, os)
-      task.dimensions['cpu'] = cpu
-      task.dimensions['pool'] = pool
-      task.dimensions.pop('gpu', None)
+
+      task_request = task.request
+      task_slice = task_request[0]
+      task_dimensions = task_slice.dimensions
+      task_dimensions['os'] = os_names.get(os, os)
+      task_dimensions['cpu'] = cpu
+      task_dimensions['pool'] = pool
+      task_dimensions['gpu'] = None
+      task_slice = task_slice.with_dimensions(**task_dimensions)
       if 'shard_timeout' in self.m.properties:
-        task.hard_timeout = int(self.m.properties['shard_timeout'])
+        task_slice = (task_slice.with_execution_timeout_secs(
+          int(self.m.properties['shard_timeout'])))
       # Set a priority lower than any builder, to prioritize shards.
-      task.priority = 25
+      task_request = (task_request.with_slice(0, task_slice).
+              with_priority(25))
+      task.request = task_request
       self.m.chromium_swarming.trigger_task(task)
       tasks.append(task)
     return tasks
diff --git a/scripts/slave/recipe_modules/dart/examples/example.expected/vm-win.json b/scripts/slave/recipe_modules/dart/examples/example.expected/vm-win.json
index 6929da9..ccc6cbd 100644
--- a/scripts/slave/recipe_modules/dart/examples/example.expected/vm-win.json
+++ b/scripts/slave/recipe_modules/dart/examples/example.expected/vm-win.json
@@ -1265,10 +1265,10 @@
       "--tag",
       "stepname:test1_shard_1 on Windows",
       "--cipd-package",
-      "tools/sdks:dart/dart-sdk/${platform}:",
-      "--cipd-package",
       "tests/co19_2/src:dart/third_party/co19:",
       "--cipd-package",
+      "tools/sdks:dart/dart-sdk/${platform}:",
+      "--cipd-package",
       ".swarming_module:infra/python/cpython/${platform}:TEST_VERSION",
       "--cipd-package",
       ".swarming_module:infra/tools/luci/logdog/butler/${platform}:TEST_VERSION",
@@ -1390,10 +1390,10 @@
       "--tag",
       "stepname:test1_shard_2 on Windows",
       "--cipd-package",
-      "tools/sdks:dart/dart-sdk/${platform}:",
-      "--cipd-package",
       "tests/co19_2/src:dart/third_party/co19:",
       "--cipd-package",
+      "tools/sdks:dart/dart-sdk/${platform}:",
+      "--cipd-package",
       ".swarming_module:infra/python/cpython/${platform}:TEST_VERSION",
       "--cipd-package",
       ".swarming_module:infra/tools/luci/logdog/butler/${platform}:TEST_VERSION",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/basic.json b/scripts/slave/recipe_modules/ios/examples/full.expected/basic.json
index 350c9ba..b89360c 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/basic.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/basic.json
@@ -2045,6 +2045,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -2153,6 +2156,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -2261,6 +2267,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -2369,6 +2378,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -2477,6 +2489,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.12",
       "--dimension",
@@ -2585,6 +2600,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -2693,6 +2711,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -2801,6 +2822,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -2909,6 +2933,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -3017,6 +3044,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/deprecate_xcode_version.json b/scripts/slave/recipe_modules/ios/examples/full.expected/deprecate_xcode_version.json
index 3306144..fa8e01a 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/deprecate_xcode_version.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/deprecate_xcode_version.json
@@ -673,6 +673,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone10,3",
       "--dimension",
@@ -787,6 +790,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone10,3",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/device_check_false.json b/scripts/slave/recipe_modules/ios/examples/full.expected/device_check_false.json
index 03ad624..a1a7181 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/device_check_false.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/device_check_false.json
@@ -566,6 +566,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone10,3",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/errors.json b/scripts/slave/recipe_modules/ios/examples/full.expected/errors.json
index 24059d6..1b55352 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/errors.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/errors.json
@@ -791,6 +791,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPad4,1",
       "--dimension",
@@ -906,6 +909,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone6,1",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/expiration_test.json b/scripts/slave/recipe_modules/ios/examples/full.expected/expiration_test.json
index 345b842..16db0be 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/expiration_test.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/expiration_test.json
@@ -581,6 +581,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "id",
       "fake99-b1",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/expired.json b/scripts/slave/recipe_modules/ios/examples/full.expected/expired.json
index 95001a1..74fa6e9 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/expired.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/expired.json
@@ -578,6 +578,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/fyi.json b/scripts/slave/recipe_modules/ios/examples/full.expected/fyi.json
index 2c6d55a..7cdbdd3 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/fyi.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/fyi.json
@@ -579,6 +579,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/host_app_path.json b/scripts/slave/recipe_modules/ios/examples/full.expected/host_app_path.json
index 29ae45c..055ef79 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/host_app_path.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/host_app_path.json
@@ -579,6 +579,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/infra_failure.json b/scripts/slave/recipe_modules/ios/examples/full.expected/infra_failure.json
index 0807573..9178cca 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/infra_failure.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/infra_failure.json
@@ -578,6 +578,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/max_runtime_test.json b/scripts/slave/recipe_modules/ios/examples/full.expected/max_runtime_test.json
index 414d449..4cf773f 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/max_runtime_test.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/max_runtime_test.json
@@ -581,6 +581,9 @@
       "--hard-timeout",
       "7200",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "id",
       "fake99-b1",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/no_exit_code.json b/scripts/slave/recipe_modules/ios/examples/full.expected/no_exit_code.json
index a1cd648..54b558f 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/no_exit_code.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/no_exit_code.json
@@ -578,6 +578,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/test_failure.json b/scripts/slave/recipe_modules/ios/examples/full.expected/test_failure.json
index d860a6b..984ed3f 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/test_failure.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/test_failure.json
@@ -578,6 +578,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/test_swarming_failure.json b/scripts/slave/recipe_modules/ios/examples/full.expected/test_swarming_failure.json
index a0efede..ff66bd7 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/test_swarming_failure.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/test_swarming_failure.json
@@ -578,6 +578,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/timed_out.json b/scripts/slave/recipe_modules/ios/examples/full.expected/timed_out.json
index 3800421..fd55674 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/timed_out.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/timed_out.json
@@ -578,6 +578,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/use_trusted_cert.json b/scripts/slave/recipe_modules/ios/examples/full.expected/use_trusted_cert.json
index 9696708..7ef45a0 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/use_trusted_cert.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/use_trusted_cert.json
@@ -579,6 +579,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/use_wpr_tools.json b/scripts/slave/recipe_modules/ios/examples/full.expected/use_wpr_tools.json
index d085632..3477094 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/use_wpr_tools.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/use_wpr_tools.json
@@ -586,6 +586,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/xcode_build_version.json b/scripts/slave/recipe_modules/ios/examples/full.expected/xcode_build_version.json
index 50df547..d9733ad 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/xcode_build_version.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/xcode_build_version.json
@@ -776,6 +776,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -884,6 +887,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -992,6 +998,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/xcode_build_version_luci.json b/scripts/slave/recipe_modules/ios/examples/full.expected/xcode_build_version_luci.json
index 5acb37a..977618f 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/xcode_build_version_luci.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/xcode_build_version_luci.json
@@ -775,6 +775,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -883,6 +886,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -991,6 +997,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/ios/examples/full.expected/xparallel_run_and_skip.json b/scripts/slave/recipe_modules/ios/examples/full.expected/xparallel_run_and_skip.json
index f0a6981..017d7fb 100644
--- a/scripts/slave/recipe_modules/ios/examples/full.expected/xparallel_run_and_skip.json
+++ b/scripts/slave/recipe_modules/ios/examples/full.expected/xparallel_run_and_skip.json
@@ -678,6 +678,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -786,6 +789,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipe_modules/v8/api.py b/scripts/slave/recipe_modules/v8/api.py
index e4a9c66..bbce853 100644
--- a/scripts/slave/recipe_modules/v8/api.py
+++ b/scripts/slave/recipe_modules/v8/api.py
@@ -1287,7 +1287,7 @@
     # On reruns, there's a fixed random seed set in the test configuration.
     if ('--random-seed' not in test.get('test_args', []) and
         test.get('use_random_seed', True)):
-      full_args.append('--random-seed=%d' % self.testing_random_seed())
+      full_args.append('--random-seed=%s' % str(self.testing_random_seed()))
 
     # Either run tests as specified by the filter (trybots only) or as
     # specified by the test configuration.
diff --git a/scripts/slave/recipe_modules/v8/testing.py b/scripts/slave/recipe_modules/v8/testing.py
index 7eb1cc3..3f4f6f8 100644
--- a/scripts/slave/recipe_modules/v8/testing.py
+++ b/scripts/slave/recipe_modules/v8/testing.py
@@ -464,7 +464,7 @@
         'isolated_target', orig_config['tests'][0])
 
     test_args = list(orig_config.get('test_args', [])) + [
-      '--random-seed', failure_dict['random_seed'],
+      '--random-seed', str(failure_dict['random_seed']),
     ]
 
     rerun_config = {
@@ -492,17 +492,22 @@
     test_step_config: Configuration object used to configure this task. Contains
         e.g. dimension and task-attribute overrides.
   """
+  task_slice = task.request[0]
+  task_dimensions = task_slice.dimensions
   # Add custom dimensions.
-  task.dimensions.update(api.v8.bot_config.get('swarming_dimensions', {}))
+  task_dimensions.update(api.v8.bot_config.get('swarming_dimensions', {}))
 
   # Override with per-test dimensions.
-  task.dimensions.update(test_step_config.swarming_dimensions or {})
+  task_dimensions.update(test_step_config.swarming_dimensions or {})
 
   # Override cpu and gpu defaults for Android as such devices don't have these
   # dimensions.
-  if task.dimensions['os'] == 'Android':
-    task.dimensions.pop('cpu')
-    task.dimensions.pop('gpu')
+  if task_dimensions['os'] == 'Android':
+    task_dimensions['cpu'] = None
+    task_dimensions['gpu'] = None
+
+  task_slice = task_slice.with_dimensions(**task_dimensions)
+  task.request = task.request.with_slice(0, task_slice)
 
   # Override attributes with per-test settings.
   for k, v in test_step_config.swarming_task_attrs.iteritems():
@@ -576,7 +581,7 @@
         idempotent=idempotent,
         isolated=self._get_isolated_hash(self.test),
         shards=shards,
-        raw_cmd=[command] + extra_args,
+        raw_cmd= [command] + extra_args,
     )
     self.task.collect_step = lambda task, **kw: (
         self._v8_collect_step(task, coverage_context, **kw))
@@ -641,7 +646,7 @@
         name=self.title,
         isolated=self._get_isolated_hash(self.test),
         task_output_dir=self.task_output_dir,
-        raw_cmd=self.command,
+        raw_cmd=self.command or [],
     )
 
     _trigger_swarming_task(self.api, self.task, self.test_step_config)
@@ -842,7 +847,7 @@
       'to_revision': self.api.buildbucket.gitiles_commit.id,
       # Use the same dimensions as the swarming task that ran this test.
       'swarming_dimensions': self._format_swarming_dimensions(
-          self.test.task.dimensions),
+          self.test.task.request[0].dimensions),
       # The isolated name is either specified in the test configurations or
       # corresponds to the name of the test suite.
       'isolated_name': test_config.get('isolated_target') or
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_failed_isolated_script_test.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_failed_isolated_script_test.json
index f74e786..7c1576a 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_failed_isolated_script_test.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_failed_isolated_script_test.json
@@ -409,9 +409,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -611,7 +608,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_failure_no_result_json.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_failure_no_result_json.json
index 1a713ac..be5d0e5 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_failure_no_result_json.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_failure_no_result_json.json
@@ -409,9 +409,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -612,7 +609,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_win_non_gpu.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_win_non_gpu.json
index f724470..1a15099 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_win_non_gpu.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_isolated_script_test_win_non_gpu.json
@@ -431,9 +431,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows",
       "--dimension",
@@ -654,7 +651,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_isolated_script_test.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_isolated_script_test.json
index 2d29bdd..fdbb6c9 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_isolated_script_test.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_isolated_script_test.json
@@ -409,9 +409,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -632,7 +629,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_isolated_script_test_with_swarming_failure.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_isolated_script_test_with_swarming_failure.json
index 76a08d1..cf8d9f0 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_isolated_script_test_with_swarming_failure.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_isolated_script_test_with_swarming_failure.json
@@ -409,9 +409,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -611,7 +608,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_isolated_script_test_with_swarming_failure_invalid.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_isolated_script_test_with_swarming_failure_invalid.json
index 768b5e2..8066f3b 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_isolated_script_test_with_swarming_failure_invalid.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_isolated_script_test_with_swarming_failure_invalid.json
@@ -409,9 +409,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -611,7 +608,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_with_bad_retcode_isolated_script_test.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_with_bad_retcode_isolated_script_test.json
index c99f8bd..277d1c9 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_with_bad_retcode_isolated_script_test.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_passed_with_bad_retcode_isolated_script_test.json
@@ -409,9 +409,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -611,7 +608,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_corrupt_json_isolated_script_test.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_corrupt_json_isolated_script_test.json
index 0e5591b..8339501 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_corrupt_json_isolated_script_test.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_corrupt_json_isolated_script_test.json
@@ -414,9 +414,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -530,9 +527,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -646,9 +640,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -863,7 +854,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_failed_isolated_script_test.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_failed_isolated_script_test.json
index 72468a9..918a0ac 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_failed_isolated_script_test.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_failed_isolated_script_test.json
@@ -414,9 +414,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -530,9 +527,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -754,7 +748,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_invalid_json_isolated_script_test.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_invalid_json_isolated_script_test.json
index 74970f8..612e45c 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_invalid_json_isolated_script_test.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_invalid_json_isolated_script_test.json
@@ -414,9 +414,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -530,9 +527,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -646,9 +640,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -851,7 +842,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_chartjson_test_disabled.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_chartjson_test_disabled.json
index 854a548..1d469bf 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_chartjson_test_disabled.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_chartjson_test_disabled.json
@@ -414,9 +414,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -530,9 +527,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -739,7 +733,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_chartjson_test_harness_failure.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_chartjson_test_harness_failure.json
index eb48c3e..e050bd9 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_chartjson_test_harness_failure.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_chartjson_test_harness_failure.json
@@ -414,9 +414,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -530,9 +527,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -770,7 +764,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_chartjson_test_missing_all_shards.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_chartjson_test_missing_all_shards.json
index 4911042..3e8559d 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_chartjson_test_missing_all_shards.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_chartjson_test_missing_all_shards.json
@@ -111,7 +111,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_chartjson_test_missing_shard.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_chartjson_test_missing_shard.json
index 846f1e9..38539fc 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_chartjson_test_missing_shard.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_chartjson_test_missing_shard.json
@@ -414,9 +414,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -530,9 +527,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -760,7 +754,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_script_test_harness_failure.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_script_test_harness_failure.json
index a212ae9..7e4b499 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_script_test_harness_failure.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_script_test_harness_failure.json
@@ -414,9 +414,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -530,9 +527,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -738,7 +732,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_script_test_missing_shard.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_script_test_missing_shard.json
index 09ccc6e..7e5a929 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_script_test_missing_shard.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_isolated_script_test_missing_shard.json
@@ -414,9 +414,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -530,9 +527,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -737,7 +731,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_passed_isolated_script_test.json b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_passed_isolated_script_test.json
index a2809c6..be4a50a 100644
--- a/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_passed_isolated_script_test.json
+++ b/scripts/slave/recipes/chromium.expected/dynamic_swarmed_sharded_passed_isolated_script_test.json
@@ -414,9 +414,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -532,9 +529,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -765,7 +759,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/gtest_custom_merge_script.json b/scripts/slave/recipes/chromium.expected/gtest_custom_merge_script.json
index 9489f3f..3668d3e6 100644
--- a/scripts/slave/recipes/chromium.expected/gtest_custom_merge_script.json
+++ b/scripts/slave/recipes/chromium.expected/gtest_custom_merge_script.json
@@ -81,7 +81,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"browser_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/isolated_script_test_custom_merge_script.json b/scripts/slave/recipes/chromium.expected/isolated_script_test_custom_merge_script.json
index d7373f0..8d64e4b 100644
--- a/scripts/slave/recipes/chromium.expected/isolated_script_test_custom_merge_script.json
+++ b/scripts/slave/recipes/chromium.expected/isolated_script_test_custom_merge_script.json
@@ -82,7 +82,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"fake_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/isolated_script_test_custom_merge_script_with_args.json b/scripts/slave/recipes/chromium.expected/isolated_script_test_custom_merge_script_with_args.json
index cde086f..4f946b5 100644
--- a/scripts/slave/recipes/chromium.expected/isolated_script_test_custom_merge_script_with_args.json
+++ b/scripts/slave/recipes/chromium.expected/isolated_script_test_custom_merge_script_with_args.json
@@ -82,7 +82,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"fake_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium.expected/isolated_script_test_custom_results_handler.json b/scripts/slave/recipes/chromium.expected/isolated_script_test_custom_results_handler.json
index 547eaba..8818a01 100644
--- a/scripts/slave/recipes/chromium.expected/isolated_script_test_custom_results_handler.json
+++ b/scripts/slave/recipes/chromium.expected/isolated_script_test_custom_results_handler.json
@@ -82,7 +82,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"fake_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_on_trybot_failing.json b/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_on_trybot_failing.json
index 054481a..bec1b86 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_on_trybot_failing.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_on_trybot_failing.json
@@ -940,9 +940,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1146,7 +1143,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -1198,9 +1194,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1367,7 +1360,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2017,9 +2009,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2188,7 +2177,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_on_trybot_passing.json b/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_on_trybot_passing.json
index f08ebdc..c58398d 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_on_trybot_passing.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_on_trybot_passing.json
@@ -940,9 +940,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1146,7 +1143,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json b/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json
index 8b0b68b..ba4853d 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/dynamic_isolated_script_test_with_args_on_trybot.json
@@ -951,9 +951,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1161,7 +1158,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium_trybot.expected/dynamic_swarmed_isolated_script_test_failure_no_result_json.json b/scripts/slave/recipes/chromium_trybot.expected/dynamic_swarmed_isolated_script_test_failure_no_result_json.json
index 41f065a..a23fab0 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/dynamic_swarmed_isolated_script_test_failure_no_result_json.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/dynamic_swarmed_isolated_script_test_failure_no_result_json.json
@@ -940,9 +940,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1147,7 +1144,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -1200,9 +1196,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1390,7 +1383,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"telemetry_gpu_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium_trybot.expected/swarmed_layout_tests_too_many_failures_for_retcode.json b/scripts/slave/recipes/chromium_trybot.expected/swarmed_layout_tests_too_many_failures_for_retcode.json
index ce25456..aac0b96 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/swarmed_layout_tests_too_many_failures_for_retcode.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/swarmed_layout_tests_too_many_failures_for_retcode.json
@@ -941,9 +941,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1147,7 +1144,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"blink_web_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -1236,9 +1232,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1405,7 +1398,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"blink_web_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2092,9 +2084,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2277,7 +2266,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"blink_web_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium_trybot.expected/swarmed_webkit_tests_interrupted.json b/scripts/slave/recipes/chromium_trybot.expected/swarmed_webkit_tests_interrupted.json
index 075eefa..544c945 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/swarmed_webkit_tests_interrupted.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/swarmed_webkit_tests_interrupted.json
@@ -941,9 +941,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1147,7 +1144,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"blink_web_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -1236,9 +1232,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1426,7 +1419,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"blink_web_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium_trybot.expected/swarmed_webkit_tests_unexpected_error.json b/scripts/slave/recipes/chromium_trybot.expected/swarmed_webkit_tests_unexpected_error.json
index b37324a..c4d3d67 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/swarmed_webkit_tests_unexpected_error.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/swarmed_webkit_tests_unexpected_error.json
@@ -941,9 +941,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1147,7 +1144,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"blink_web_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -1236,9 +1232,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1426,7 +1419,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"blink_web_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium_trybot.expected/swarming_test_failure.json b/scripts/slave/recipes/chromium_trybot.expected/swarming_test_failure.json
index 938da49..87a0d36 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/swarming_test_failure.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/swarming_test_failure.json
@@ -939,9 +939,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1152,7 +1149,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -1233,9 +1229,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1399,7 +1392,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json b/scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json
index f75fe63..60eb427 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/swarming_test_with_priority_expiration_and_timeout.json
@@ -941,9 +941,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1144,7 +1141,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_blink_web_tests.json b/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_blink_web_tests.json
index 9f27620..b4a3027 100644
--- a/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_blink_web_tests.json
+++ b/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_blink_web_tests.json
@@ -1109,9 +1109,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1336,7 +1333,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"blink_web_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -1401,7 +1397,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_swarming_tests.json b/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_swarming_tests.json
index ae9af2b..894e259 100644
--- a/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_swarming_tests.json
+++ b/scripts/slave/recipes/findit/chromium/flake.expected/flakiness_swarming_tests.json
@@ -1112,9 +1112,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1231,9 +1228,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1350,9 +1344,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1469,9 +1460,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1588,9 +1576,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1707,9 +1692,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1826,9 +1808,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1945,9 +1924,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2064,9 +2040,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2183,9 +2156,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2390,7 +2360,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"browser_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2464,7 +2433,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/all_test_failed.json b/scripts/slave/recipes/findit/chromium/test.expected/all_test_failed.json
index cbc93ed..d32e743 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/all_test_failed.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/all_test_failed.json
@@ -1033,9 +1033,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1261,7 +1258,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -1349,7 +1345,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/all_test_passed.json b/scripts/slave/recipes/findit/chromium/test.expected/all_test_passed.json
index 8c9fbae..44d8dd1 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/all_test_passed.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/all_test_passed.json
@@ -1030,9 +1030,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1228,7 +1225,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -1311,7 +1307,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/blink_web_tests.json b/scripts/slave/recipes/findit/chromium/test.expected/blink_web_tests.json
index 3a4a83f..2e56008 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/blink_web_tests.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/blink_web_tests.json
@@ -1127,9 +1127,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1366,7 +1363,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"blink_web_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2221,9 +2217,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2414,7 +2407,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"blink_web_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2488,7 +2480,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -2525,7 +2516,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/builder_as_tester.json b/scripts/slave/recipes/findit/chromium/test.expected/builder_as_tester.json
index 32cdf87..83a0aa7 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/builder_as_tester.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/builder_as_tester.json
@@ -998,9 +998,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1196,7 +1193,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"services_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -1259,7 +1255,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json b/scripts/slave/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json
index 3c0c65a..de31657 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/findit_consecutive_culprits.json
@@ -1127,9 +1127,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1334,7 +1331,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2183,9 +2179,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2351,7 +2344,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -3203,9 +3195,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3381,7 +3370,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -3450,7 +3438,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -3479,7 +3466,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -3508,7 +3494,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_first_sub_range.json b/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_first_sub_range.json
index c08ddd3..40774ef 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_first_sub_range.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_first_sub_range.json
@@ -1127,9 +1127,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1334,7 +1331,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2183,9 +2179,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2351,7 +2344,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -3203,9 +3195,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3381,7 +3370,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -3447,7 +3435,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -3476,7 +3463,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -3508,7 +3494,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_last_sub_range.json b/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_last_sub_range.json
index 47697ca..cc94e12 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_last_sub_range.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_last_sub_range.json
@@ -1127,9 +1127,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1334,7 +1331,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2186,9 +2182,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2364,7 +2357,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2430,7 +2422,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -2462,7 +2453,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_middle_sub_range.json b/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_middle_sub_range.json
index 15722fc..b42c95e 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_middle_sub_range.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/findit_culprit_in_middle_sub_range.json
@@ -1130,9 +1130,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1337,7 +1334,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2187,9 +2183,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2355,7 +2348,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -3204,9 +3196,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3372,7 +3361,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4224,9 +4212,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4402,7 +4387,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4468,7 +4452,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -4497,7 +4480,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -4526,7 +4508,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -4558,7 +4539,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json b/scripts/slave/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json
index c586dd3..a5aba26 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/findit_steps_multiple_culprits.json
@@ -1141,9 +1141,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1256,9 +1253,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1501,7 +1495,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"browser_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -1641,7 +1634,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2500,9 +2492,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2678,7 +2667,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"browser_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -3534,9 +3522,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3702,7 +3687,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4560,9 +4544,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4738,7 +4719,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4804,7 +4784,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -4834,7 +4813,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -4866,7 +4844,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -4895,7 +4872,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -4927,7 +4903,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json b/scripts/slave/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json
index 5c57481..8c857e1 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/findit_tests_multiple_culprits.json
@@ -1130,9 +1130,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1347,7 +1344,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2200,9 +2196,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2378,7 +2371,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -3231,9 +3223,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3409,7 +3398,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4259,9 +4247,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4427,7 +4412,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5279,9 +5263,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -5457,7 +5438,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5526,7 +5506,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -5566,7 +5545,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -5602,7 +5580,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -5631,7 +5608,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -5663,7 +5639,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/flaky_tests.json b/scripts/slave/recipes/findit/chromium/test.expected/flaky_tests.json
index 3b8e4ce..056c299 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/flaky_tests.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/flaky_tests.json
@@ -1033,9 +1033,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1251,7 +1248,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2059,9 +2055,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2231,7 +2224,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2322,7 +2314,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -2359,7 +2350,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.json b/scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.json
index 0f5a48a..fe65edd 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/only_one_test_passed.json
@@ -1033,9 +1033,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1251,7 +1248,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2059,9 +2055,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2221,7 +2214,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2304,7 +2296,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -2341,7 +2332,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/remove_culprits_for_flaky_failures.json b/scripts/slave/recipes/findit/chromium/test.expected/remove_culprits_for_flaky_failures.json
index 52ac01a..74b11de 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/remove_culprits_for_flaky_failures.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/remove_culprits_for_flaky_failures.json
@@ -1130,9 +1130,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1337,7 +1334,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2190,9 +2186,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2379,7 +2372,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2454,7 +2446,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -2487,7 +2478,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/swarming_tests.json b/scripts/slave/recipes/findit/chromium/test.expected/swarming_tests.json
index befc38f..8b31a65 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/swarming_tests.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/swarming_tests.json
@@ -1122,9 +1122,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1329,7 +1326,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -1395,7 +1391,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/unaffected_test_skipped_by_analyze.json b/scripts/slave/recipes/findit/chromium/test.expected/unaffected_test_skipped_by_analyze.json
index 34cdd8e..65dec26 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/unaffected_test_skipped_by_analyze.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/unaffected_test_skipped_by_analyze.json
@@ -1140,9 +1140,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1338,7 +1335,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"affected_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -1425,7 +1421,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/use_abbreviated_revision_in_step_name.json b/scripts/slave/recipes/findit/chromium/test.expected/use_abbreviated_revision_in_step_name.json
index 220dce0..40ca3b4 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/use_abbreviated_revision_in_step_name.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/use_abbreviated_revision_in_step_name.json
@@ -1125,9 +1125,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1342,7 +1339,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -1411,7 +1407,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/findit/chromium/test.expected/use_analyze_set_to_False_for_non_linear_try_job.json b/scripts/slave/recipes/findit/chromium/test.expected/use_analyze_set_to_False_for_non_linear_try_job.json
index 96f7de6..09dd55a 100644
--- a/scripts/slave/recipes/findit/chromium/test.expected/use_analyze_set_to_False_for_non_linear_try_job.json
+++ b/scripts/slave/recipes/findit/chromium/test.expected/use_analyze_set_to_False_for_non_linear_try_job.json
@@ -1127,9 +1127,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -1334,7 +1331,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2186,9 +2182,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2364,7 +2357,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"gl_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -2430,7 +2422,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
@@ -2462,7 +2453,6 @@
       "@@@STEP_LOG_LINE@report@        \"valid\": true, @@@",
       "@@@STEP_LOG_LINE@report@        \"step_metadata\": {@@@",
       "@@@STEP_LOG_LINE@report@          \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@report@            \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@report@            \"os\": \"Mac-10.13\", @@@",
       "@@@STEP_LOG_LINE@report@            \"cpu\": \"x86-64\", @@@",
       "@@@STEP_LOG_LINE@report@            \"pool\": \"Chrome\"@@@",
diff --git a/scripts/slave/recipes/ios/try.expected/gn.json b/scripts/slave/recipes/ios/try.expected/gn.json
index 0f4a50b..7e2359a 100644
--- a/scripts/slave/recipes/ios/try.expected/gn.json
+++ b/scripts/slave/recipes/ios/try.expected/gn.json
@@ -1018,6 +1018,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipes/ios/try.expected/icu_patch.json b/scripts/slave/recipes/ios/try.expected/icu_patch.json
index e9149c6..09be69d 100644
--- a/scripts/slave/recipes/ios/try.expected/icu_patch.json
+++ b/scripts/slave/recipes/ios/try.expected/icu_patch.json
@@ -750,6 +750,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipes/ios/try.expected/parent.json b/scripts/slave/recipes/ios/try.expected/parent.json
index 0e15acb..e348e21 100644
--- a/scripts/slave/recipes/ios/try.expected/parent.json
+++ b/scripts/slave/recipes/ios/try.expected/parent.json
@@ -766,6 +766,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipes/ios/try.py b/scripts/slave/recipes/ios/try.py
index f980b78..67caec8 100644
--- a/scripts/slave/recipes/ios/try.py
+++ b/scripts/slave/recipes/ios/try.py
@@ -54,7 +54,7 @@
     + try_build()
     + api.platform('mac', 64)
     + api.properties(
-      issue=123456,
+      issue='123456',
       mastername='tryserver.fake',
       patchset=1,
       bot_id='fake-vm',
@@ -99,11 +99,11 @@
     + try_build()
     + api.platform('mac', 64)
     + api.properties(
-      issue=123456,
+      issue='123456',
       mastername='tryserver.fake',
       patchset=1,
       bot_id='fake-vm',
-      path_config='kitchen',
+      path_config='kitchen'
     )
     + api.buildbucket.try_build(
       project='chromium',
@@ -152,11 +152,11 @@
     + try_build()
     + api.platform('mac', 64)
     + api.properties(
-      issue=123456,
+      issue='123456',
       mastername='tryserver.fake',
       patchset=1,
       bot_id='fake-vm',
-      path_config='kitchen',
+      path_config='kitchen'
     )
     + api.buildbucket.try_build(
       project='chromium',
@@ -203,7 +203,7 @@
     + try_build()
     + api.platform('mac', 64)
     + api.properties(
-      issue=123456,
+      issue='123456',
       mastername='tryserver.fake',
       patchset=1,
       bot_id='fake-vm',
@@ -277,7 +277,7 @@
     + try_build(git_repo='https://chromium.googlesource.com/chromium/deps/icu')
     + api.platform('mac', 64)
     + api.properties(
-      issue=123456,
+      issue='123456',
       mastername='tryserver.fake',
       patchset=1,
       patch_project='icu',
@@ -317,7 +317,7 @@
     + try_build()
     + api.platform('mac', 64)
     + api.properties(
-      issue=123456,
+      issue='123456',
       mastername='tryserver.fake',
       patchset=1,
       bot_id='fake-vm',
@@ -359,7 +359,7 @@
     + try_build()
     + api.platform('mac', 64)
     + api.properties(
-      issue=123456,
+      issue='123456',
       mastername='tryserver.fake',
       patchset=1,
       bot_id='fake-vm',
@@ -403,7 +403,7 @@
     + try_build()
     + api.platform('mac', 64)
     + api.properties(
-      issue=123456,
+      issue='123456',
       mastername='tryserver.fake',
       patchset=1,
       bot_id='fake-vm',
@@ -444,7 +444,7 @@
     + try_build()
     + api.platform('mac', 64)
     + api.properties(
-      issue=123456,
+      issue='123456',
       mastername='tryserver.fake',
       patchset=1,
       bot_id='fake-vm',
@@ -479,7 +479,7 @@
     + try_build()
     + api.platform('mac', 64)
     + api.properties(
-      issue=123456,
+      issue='123456',
       mastername='tryserver.fake',
       patchset=1,
       bot_id='fake-vm',
diff --git a/scripts/slave/recipes/ios/unified_builder_tester.expected/basic.json b/scripts/slave/recipes/ios/unified_builder_tester.expected/basic.json
index af57e7f..09dc4d5 100644
--- a/scripts/slave/recipes/ios/unified_builder_tester.expected/basic.json
+++ b/scripts/slave/recipes/ios/unified_builder_tester.expected/basic.json
@@ -912,6 +912,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -1025,6 +1028,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -1138,6 +1144,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipes/ios/unified_builder_tester.expected/basic_experimental.json b/scripts/slave/recipes/ios/unified_builder_tester.expected/basic_experimental.json
index c19fdc2..753f495 100644
--- a/scripts/slave/recipes/ios/unified_builder_tester.expected/basic_experimental.json
+++ b/scripts/slave/recipes/ios/unified_builder_tester.expected/basic_experimental.json
@@ -843,6 +843,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -956,6 +959,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
@@ -1069,6 +1075,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac",
       "--dimension",
diff --git a/scripts/slave/recipes/swarming/staging.expected/one_fails.json b/scripts/slave/recipes/swarming/staging.expected/one_fails.json
index d06e664..0af1db3 100644
--- a/scripts/slave/recipes/swarming/staging.expected/one_fails.json
+++ b/scripts/slave/recipes/swarming/staging.expected/one_fails.json
@@ -741,9 +741,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu",
       "--dimension",
@@ -850,9 +847,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu",
       "--dimension",
@@ -1047,7 +1041,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"browser_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/swarming/staging.expected/windows.json b/scripts/slave/recipes/swarming/staging.expected/windows.json
index a99c011..6d91f4ee 100644
--- a/scripts/slave/recipes/swarming/staging.expected/windows.json
+++ b/scripts/slave/recipes/swarming/staging.expected/windows.json
@@ -755,9 +755,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -864,9 +861,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1071,7 +1065,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"browser_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_bisect_swarming.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_bisect_swarming.json
index 2b39f15..a3ac5ac 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_bisect_swarming.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_bisect_swarming.json
@@ -368,9 +368,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -476,9 +473,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -647,7 +641,7 @@
       "@@@STEP_LOG_LINE@fast@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@fast@@@@",
       "@@@STEP_LOG_LINE@fast@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@fast@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/fast\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@fast@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/fast\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@fast@@@@",
       "@@@STEP_LOG_LINE@fast@Run #1@@@",
       "@@@STEP_LOG_LINE@fast@Exit code: 1@@@",
@@ -671,7 +665,7 @@
       "@@@STEP_LOG_LINE@slow@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@slow@@@@",
       "@@@STEP_LOG_LINE@slow@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@slow@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/slow\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@slow@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/slow\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@slow@@@@",
       "@@@STEP_LOG_LINE@slow@Run #1@@@",
       "@@@STEP_LOG_LINE@slow@Exit code: 1@@@",
@@ -1067,9 +1061,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1490,9 +1481,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1647,7 +1635,7 @@
       "@@@STEP_LOG_LINE@fast@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@fast@@@@",
       "@@@STEP_LOG_LINE@fast@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@fast@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/fast\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@fast@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/fast\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@fast@@@@",
       "@@@STEP_LOG_LINE@fast@Run #1@@@",
       "@@@STEP_LOG_LINE@fast@Exit code: 1@@@",
@@ -1671,7 +1659,7 @@
       "@@@STEP_LOG_LINE@slow@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@slow@@@@",
       "@@@STEP_LOG_LINE@slow@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@slow@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/slow\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@slow@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/slow\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@slow@@@@",
       "@@@STEP_LOG_LINE@slow@Run #1@@@",
       "@@@STEP_LOG_LINE@slow@Exit code: 1@@@",
@@ -1951,9 +1939,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_bisect_tester_swarming.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_bisect_tester_swarming.json
index e8804ff..b0deb9c 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_bisect_tester_swarming.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_bisect_tester_swarming.json
@@ -81,9 +81,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -189,9 +186,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -330,7 +324,7 @@
       "@@@STEP_LOG_LINE@fast@ useful: envvars@@@",
       "@@@STEP_LOG_LINE@fast@@@@",
       "@@@STEP_LOG_LINE@fast@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@fast@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar - builder\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/fast\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@fast@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar - builder\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/fast\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@fast@@@@",
       "@@@STEP_LOG_LINE@fast@Run #1@@@",
       "@@@STEP_LOG_LINE@fast@Exit code: 1@@@",
@@ -356,7 +350,7 @@
       "@@@STEP_LOG_LINE@slow@ useful: envvars@@@",
       "@@@STEP_LOG_LINE@slow@@@@",
       "@@@STEP_LOG_LINE@slow@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@slow@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar - builder\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/slow\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@slow@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar - builder\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/slow\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@slow@@@@",
       "@@@STEP_LOG_LINE@slow@Run #1@@@",
       "@@@STEP_LOG_LINE@slow@Exit code: 1@@@",
@@ -580,9 +574,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -793,9 +784,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_flako.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_flako.json
index 354bbc8..2d5b3c5 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_flako.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_flako.json
@@ -15,7 +15,7 @@
       "@@@STEP_LOG_LINE@test-name@ useful: envvars@@@",
       "@@@STEP_LOG_LINE@test-name@@@@",
       "@@@STEP_LOG_LINE@test-name@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar - builder\"' -p 'timeout_sec=60' -p 'variant=\"stress\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Windows-7-SP1\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name\"' -p 'build_config=\"Debug\"' -p 'isolated_name=\"test262\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[\"--extra-flags=--flag\"]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar - builder\"' -p 'timeout_sec=60' -p 'variant=\"stress\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Windows-7-SP1\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name\"' -p 'build_config=\"Debug\"' -p 'isolated_name=\"test262\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[\"--extra-flags=--flag\"]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name@@@@",
       "@@@STEP_LOG_LINE@test-name@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name@Exit code: 1@@@",
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_flako_numfuzz.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_flako_numfuzz.json
index 6bcddf8..a2545df 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_flako_numfuzz.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_flako_numfuzz.json
@@ -15,7 +15,7 @@
       "@@@STEP_LOG_LINE@test-name@ useful: envvars@@@",
       "@@@STEP_LOG_LINE@test-name@@@@",
       "@@@STEP_LOG_LINE@test-name@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar - builder\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Windows-7-SP1\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name\"' -p 'build_config=\"Debug\"' -p 'isolated_name=\"test262\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[\"--extra-flags\", \"--flag1\", \"--extra-flags\", \"--flag2\"]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar - builder\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Windows-7-SP1\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name\"' -p 'build_config=\"Debug\"' -p 'isolated_name=\"test262\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[\"--extra-flags\", \"--flag1\", \"--extra-flags\", \"--flag2\"]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name@@@@",
       "@@@STEP_LOG_LINE@test-name@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name@Exit code: 1@@@",
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_fuzz_archive.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_fuzz_archive.json
index 11ae1b5..ec3f34d 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_fuzz_archive.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_fuzz_archive.json
@@ -81,9 +81,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_gcmole.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_gcmole.json
index 79c7282..201ad27 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_gcmole.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_gcmole.json
@@ -81,9 +81,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -173,9 +170,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -265,9 +259,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -357,9 +348,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_generic_swarming_task.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_generic_swarming_task.json
index 9f352b8..15be932 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_generic_swarming_task.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_generic_swarming_task.json
@@ -81,9 +81,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_initializers.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_initializers.json
index 99cb3ab..b34fe96 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_initializers.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_initializers.json
@@ -81,9 +81,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_one_failure.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_one_failure.json
index ff11145..2bdba8b 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_one_failure.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_one_failure.json
@@ -368,9 +368,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -476,9 +473,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -647,7 +641,7 @@
       "@@@STEP_LOG_LINE@test-name@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name@@@@",
       "@@@STEP_LOG_LINE@test-name@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name@@@@",
       "@@@STEP_LOG_LINE@test-name@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name@Exit code: 1@@@",
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_one_failure_build_env_not_supported.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_one_failure_build_env_not_supported.json
index 971cc5f..c5bf11f 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_one_failure_build_env_not_supported.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_one_failure_build_env_not_supported.json
@@ -81,9 +81,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -189,9 +186,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -328,7 +322,7 @@
       "@@@STEP_LOG_LINE@test-name@Not available. Please look up the builder's configuration.@@@",
       "@@@STEP_LOG_LINE@test-name@@@@",
       "@@@STEP_LOG_LINE@test-name@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar - builder\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar - builder\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name@@@@",
       "@@@STEP_LOG_LINE@test-name@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name@Exit code: 1@@@",
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_perf.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_perf.json
index a2dd45c..e03bd4a 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_perf.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_perf.json
@@ -81,9 +81,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -177,9 +174,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -273,9 +267,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -369,9 +360,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -465,9 +453,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_swarming_collect_failure.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_swarming_collect_failure.json
index 2abcaf7..eda23a8 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_swarming_collect_failure.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_swarming_collect_failure.json
@@ -81,9 +81,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -189,9 +186,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_test_failures.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_test_failures.json
index bb1625d..f582ff0 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_test_failures.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_test_failures.json
@@ -29,9 +29,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -167,7 +164,7 @@
       "@@@STEP_LOG_LINE@other-test-very-very-very-long-n...@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@other-test-very-very-very-long-n...@@@@",
       "@@@STEP_LOG_LINE@other-test-very-very-very-long-n...@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@other-test-very-very-very-long-n...@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"other-suite/dir/other-test-very-very-very-long-name0\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@other-test-very-very-very-long-n...@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"other-suite/dir/other-test-very-very-very-long-name0\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@other-test-very-very-very-long-n...@@@@",
       "@@@STEP_LOG_LINE@other-test-very-very-very-long-n...@Run #1@@@",
       "@@@STEP_LOG_LINE@other-test-very-very-very-long-n...@Exit code: 1@@@",
@@ -319,7 +316,7 @@
       "@@@STEP_LOG_LINE@test-name0@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name0@@@@",
       "@@@STEP_LOG_LINE@test-name0@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name0@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name0\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name0@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name0\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name0@@@@",
       "@@@STEP_LOG_LINE@test-name0@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name0@Exit code: 1@@@",
@@ -341,7 +338,7 @@
       "@@@STEP_LOG_LINE@test-name0@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name0@@@@",
       "@@@STEP_LOG_LINE@test-name0@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name0@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name0\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name0@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name0\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name0@@@@",
       "@@@STEP_LOG_LINE@test-name0@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name0@Exit code: 1@@@",
@@ -365,7 +362,7 @@
       "@@@STEP_LOG_LINE@test-name1@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name1@@@@",
       "@@@STEP_LOG_LINE@test-name1@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name1@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name1\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name1@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name1\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name1@@@@",
       "@@@STEP_LOG_LINE@test-name1@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name1@Exit code: 1@@@",
@@ -387,7 +384,7 @@
       "@@@STEP_LOG_LINE@test-name1@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name1@@@@",
       "@@@STEP_LOG_LINE@test-name1@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name1@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name1\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name1@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name1\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name1@@@@",
       "@@@STEP_LOG_LINE@test-name1@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name1@Exit code: 1@@@",
@@ -411,7 +408,7 @@
       "@@@STEP_LOG_LINE@test-name2@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name2@@@@",
       "@@@STEP_LOG_LINE@test-name2@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name2@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name2\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name2@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name2\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name2@@@@",
       "@@@STEP_LOG_LINE@test-name2@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name2@Exit code: 1@@@",
@@ -433,7 +430,7 @@
       "@@@STEP_LOG_LINE@test-name2@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name2@@@@",
       "@@@STEP_LOG_LINE@test-name2@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name2@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name2\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name2@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name2\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name2@@@@",
       "@@@STEP_LOG_LINE@test-name2@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name2@Exit code: 1@@@",
@@ -457,7 +454,7 @@
       "@@@STEP_LOG_LINE@test-name3@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name3@@@@",
       "@@@STEP_LOG_LINE@test-name3@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name3@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name3\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name3@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name3\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name3@@@@",
       "@@@STEP_LOG_LINE@test-name3@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name3@Exit code: 1@@@",
@@ -479,7 +476,7 @@
       "@@@STEP_LOG_LINE@test-name3@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name3@@@@",
       "@@@STEP_LOG_LINE@test-name3@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name3@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name3\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name3@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name3\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name3@@@@",
       "@@@STEP_LOG_LINE@test-name3@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name3@Exit code: 1@@@",
@@ -503,7 +500,7 @@
       "@@@STEP_LOG_LINE@test-name4@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name4@@@@",
       "@@@STEP_LOG_LINE@test-name4@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name4@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name4\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name4@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name4\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name4@@@@",
       "@@@STEP_LOG_LINE@test-name4@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name4@Exit code: 1@@@",
@@ -525,7 +522,7 @@
       "@@@STEP_LOG_LINE@test-name4@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name4@@@@",
       "@@@STEP_LOG_LINE@test-name4@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name4@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name4\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name4@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name4\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name4@@@@",
       "@@@STEP_LOG_LINE@test-name4@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name4@Exit code: 1@@@",
@@ -549,7 +546,7 @@
       "@@@STEP_LOG_LINE@test-name5@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name5@@@@",
       "@@@STEP_LOG_LINE@test-name5@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name5@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name5\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name5@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name5\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name5@@@@",
       "@@@STEP_LOG_LINE@test-name5@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name5@Exit code: 1@@@",
@@ -571,7 +568,7 @@
       "@@@STEP_LOG_LINE@test-name5@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name5@@@@",
       "@@@STEP_LOG_LINE@test-name5@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name5@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name5\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name5@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name5\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name5@@@@",
       "@@@STEP_LOG_LINE@test-name5@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name5@Exit code: 1@@@",
@@ -595,7 +592,7 @@
       "@@@STEP_LOG_LINE@test-name6@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name6@@@@",
       "@@@STEP_LOG_LINE@test-name6@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name6@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name6\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name6@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name6\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name6@@@@",
       "@@@STEP_LOG_LINE@test-name6@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name6@Exit code: 1@@@",
@@ -617,7 +614,7 @@
       "@@@STEP_LOG_LINE@test-name6@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name6@@@@",
       "@@@STEP_LOG_LINE@test-name6@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name6@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name6\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name6@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name6\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name6@@@@",
       "@@@STEP_LOG_LINE@test-name6@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name6@Exit code: 1@@@",
@@ -641,7 +638,7 @@
       "@@@STEP_LOG_LINE@test-name7@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name7@@@@",
       "@@@STEP_LOG_LINE@test-name7@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name7@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name7\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name7@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name7\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name7@@@@",
       "@@@STEP_LOG_LINE@test-name7@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name7@Exit code: 1@@@",
@@ -663,7 +660,7 @@
       "@@@STEP_LOG_LINE@test-name7@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name7@@@@",
       "@@@STEP_LOG_LINE@test-name7@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name7@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name7\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name7@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name7\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name7@@@@",
       "@@@STEP_LOG_LINE@test-name7@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name7@Exit code: 1@@@",
@@ -687,7 +684,7 @@
       "@@@STEP_LOG_LINE@test-name8@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name8@@@@",
       "@@@STEP_LOG_LINE@test-name8@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name8@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name8\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name8@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name8\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name8@@@@",
       "@@@STEP_LOG_LINE@test-name8@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name8@Exit code: 1@@@",
@@ -709,7 +706,7 @@
       "@@@STEP_LOG_LINE@test-name8@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name8@@@@",
       "@@@STEP_LOG_LINE@test-name8@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name8@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name8\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name8@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name8\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name8@@@@",
       "@@@STEP_LOG_LINE@test-name8@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name8@Exit code: 1@@@",
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_test_failures_flakes.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_test_failures_flakes.json
index 845ad42..c930e3d 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_test_failures_flakes.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_test_failures_flakes.json
@@ -29,9 +29,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -173,7 +170,7 @@
       "@@@STEP_LOG_LINE@test-name@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name@@@@",
       "@@@STEP_LOG_LINE@test-name@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name@@@@",
       "@@@STEP_LOG_LINE@test-name@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name@Exit code: 1@@@",
@@ -206,7 +203,7 @@
       "@@@STEP_LOG_LINE@test-name2@ gn_args: target_cpu = \"x86\" use_goma = true@@@",
       "@@@STEP_LOG_LINE@test-name2@@@@",
       "@@@STEP_LOG_LINE@test-name2@Trigger flake bisect on command line:@@@",
-      "@@@STEP_LOG_LINE@test-name2@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"gpu:none\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name2\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
+      "@@@STEP_LOG_LINE@test-name2@bb add v8/try.triggered/v8_flako -p 'to_revision=\"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef\"' -p 'bisect_buildername=\"V8 Foobar\"' -p 'timeout_sec=60' -p 'variant=\"default\"' -p 'swarming_dimensions=[\"cpu:x86-64\", \"os:Ubuntu-14.04\", \"pool:Chrome\"]' -p 'test_name=\"suite-name/dir/test-name2\"' -p 'build_config=\"Release\"' -p 'isolated_name=\"bot_default\"' -p 'bisect_mastername=\"client.v8\"' -p 'extra_args=[]' -p 'total_timeout_sec=120'@@@",
       "@@@STEP_LOG_LINE@test-name2@@@@",
       "@@@STEP_LOG_LINE@test-name2@Run #1@@@",
       "@@@STEP_LOG_LINE@test-name2@Exit code: 1@@@",
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_tester_with_test_spec.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_tester_with_test_spec.json
index 8f08a2b..9800c88 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_tester_with_test_spec.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_tester_with_test_spec.json
@@ -28,7 +28,7 @@
       "--io-timeout",
       "1200",
       "--hard-timeout",
-      "7200",
+      "2700",
       "--dimension",
       "cpu",
       "x86-64",
@@ -140,7 +140,7 @@
       "--io-timeout",
       "1200",
       "--hard-timeout",
-      "7200",
+      "2700",
       "--dimension",
       "cpu",
       "x86-64",
@@ -238,7 +238,7 @@
       "--namespace",
       "default-gzip",
       "--priority",
-      "100",
+      "25",
       "--task-name",
       "Mjsunit - everything/Ubuntu-14.04/[dummy has/V8 Foobar/571",
       "--dump-json",
@@ -248,7 +248,7 @@
       "--io-timeout",
       "1200",
       "--hard-timeout",
-      "7200",
+      "2700",
       "--dimension",
       "cpu",
       "x86-64",
diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_with_test_spec.json b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_with_test_spec.json
index b5ea3e7..8097ee8 100644
--- a/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_with_test_spec.json
+++ b/scripts/slave/recipes/v8.expected/full_client_v8_V8_Foobar_with_test_spec.json
@@ -83,7 +83,7 @@
       "--io-timeout",
       "1200",
       "--hard-timeout",
-      "7200",
+      "2700",
       "--dimension",
       "cpu",
       "x86-64",
@@ -195,7 +195,7 @@
       "--io-timeout",
       "1200",
       "--hard-timeout",
-      "7200",
+      "2700",
       "--dimension",
       "cpu",
       "x86-64",
@@ -293,7 +293,7 @@
       "--namespace",
       "default-gzip",
       "--priority",
-      "100",
+      "25",
       "--task-name",
       "Mjsunit - everything/Ubuntu-14.04/[dummy has/V8 Foobar/571",
       "--dump-json",
@@ -303,7 +303,7 @@
       "--io-timeout",
       "1200",
       "--hard-timeout",
-      "7200",
+      "2700",
       "--dimension",
       "cpu",
       "x86-64",
diff --git a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_failures.json b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_failures.json
index 8e1a2aa..a859ba8 100644
--- a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_failures.json
+++ b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_failures.json
@@ -81,9 +81,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -189,9 +186,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
diff --git a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_flakes.json b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_flakes.json
index d3f16b1..5fdc22a 100644
--- a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_flakes.json
+++ b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_flakes.json
@@ -81,9 +81,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -189,9 +186,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
diff --git a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_positional_extra_flags.json b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_positional_extra_flags.json
index c581aa6..4efb53b 100644
--- a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_positional_extra_flags.json
+++ b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_positional_extra_flags.json
@@ -88,9 +88,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -198,9 +195,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
diff --git a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_slow_tests.json b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_slow_tests.json
index e4a623a..f7ef72c 100644
--- a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_slow_tests.json
+++ b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_slow_tests.json
@@ -81,9 +81,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -189,9 +186,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
diff --git a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_test_filter.json b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_test_filter.json
index d4f13b5..a3e7016 100644
--- a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_test_filter.json
+++ b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_test_filter.json
@@ -92,9 +92,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
diff --git a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_triggered_by_cq.json b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_triggered_by_cq.json
index ae372e7..dbb46e9 100644
--- a/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_triggered_by_cq.json
+++ b/scripts/slave/recipes/v8.expected/full_tryserver_v8_v8_foobar_rel_ng_triggered_triggered_by_cq.json
@@ -81,9 +81,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -189,9 +186,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
diff --git a/scripts/slave/recipes/v8.py b/scripts/slave/recipes/v8.py
index d99e385..154ea54 100644
--- a/scripts/slave/recipes/v8.py
+++ b/scripts/slave/recipes/v8.py
@@ -736,7 +736,7 @@
     api.post_process(Filter().include_re(r'.*Mjsunit.*'))
   )
 
-  # Test that cpu and gpu dimensinos are reset when triggering Android bots.
+  # Test that cpu and gpu dimensions are reset when triggering Android bots.
   android_test_spec = """
     {
       "swarming_dimensions": {
diff --git a/scripts/slave/recipes/v8/flako.py b/scripts/slave/recipes/v8/flako.py
index a73139c..685a0e7 100644
--- a/scripts/slave/recipes/v8/flako.py
+++ b/scripts/slave/recipes/v8/flako.py
@@ -351,7 +351,7 @@
       # cancel the task, such that they are not in the list of pending tasks or
       # override the step names.
       task = self.api.chromium_swarming.task(
-          '%s - shard %d' % (step_prefix, shard),
+          name='%s - shard %d' % (step_prefix, shard),
           isolated=isolated_hash,
           task_output_dir=path.join('task_output_dir_%d' % shard),
           raw_cmd=self.command.raw_cmd(self.multiplier, offset),
@@ -359,13 +359,19 @@
 
       # Use lower swarming priority given the increased time of the task.
       if self.multiplier > 1:
-        task.priority = max(task.priority + 10, 255)
+        task.request = (task.request.with_priority(
+                          max(task.request.priority + 10, 255)))
 
       # Override cpu and gpu defaults for Android as such devices don't have
       # these dimensions.
-      if task.dimensions['os'] == 'Android':
-        task.dimensions.pop('cpu')
-        task.dimensions.pop('gpu')
+      task_slice = task.request[0]
+      task_dimensions = task_slice.dimensions
+      if task_dimensions['os'] == 'Android':
+        task_dimensions['cpu'] = None
+        task_dimensions['gpu'] = None
+
+      task_slice = task_slice.with_dimensions(**task_dimensions)
+      task.request = task.request.with_slice(0, task_slice)
 
       self.api.chromium_swarming.trigger_task(task)
       return task
diff --git a/scripts/slave/recipes/webrtc/chromium_ios.expected/basic_goma_build.json b/scripts/slave/recipes/webrtc/chromium_ios.expected/basic_goma_build.json
index efa1827..09a990d 100644
--- a/scripts/slave/recipes/webrtc/chromium_ios.expected/basic_goma_build.json
+++ b/scripts/slave/recipes/webrtc/chromium_ios.expected/basic_goma_build.json
@@ -867,6 +867,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone10,3",
       "--dimension",
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_10_0.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_10_0.json
index 3720454..2b60d12 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_10_0.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_10_0.json
@@ -2714,6 +2714,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2828,6 +2831,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2942,6 +2948,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3056,6 +3065,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3170,6 +3182,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3284,6 +3299,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3398,6 +3416,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3512,6 +3533,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3626,6 +3650,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3740,6 +3767,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3854,6 +3884,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3968,6 +4001,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4082,6 +4118,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4196,6 +4235,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4310,6 +4352,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4424,6 +4469,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4538,6 +4586,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4652,6 +4703,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_11.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_11.json
index 83a2933..f72de4a 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_11.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_11.json
@@ -2714,6 +2714,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2828,6 +2831,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2942,6 +2948,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3056,6 +3065,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3170,6 +3182,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3284,6 +3299,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3398,6 +3416,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3512,6 +3533,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3626,6 +3650,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3740,6 +3767,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3854,6 +3884,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3968,6 +4001,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4082,6 +4118,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4196,6 +4235,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4310,6 +4352,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4424,6 +4469,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4538,6 +4586,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4652,6 +4703,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_12.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_12.json
index 0267d20..c214ac9 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_12.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_ci_ios64_sim_debug_ios_12.json
@@ -2714,6 +2714,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2828,6 +2831,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2942,6 +2948,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3056,6 +3065,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3170,6 +3182,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3284,6 +3299,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3398,6 +3416,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3512,6 +3533,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3626,6 +3650,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3740,6 +3767,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3854,6 +3884,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3968,6 +4001,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4082,6 +4118,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4196,6 +4235,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4310,6 +4352,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4424,6 +4469,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4538,6 +4586,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4652,6 +4703,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_debug.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_debug.json
index 490e69f..2a46118 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_debug.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_debug.json
@@ -1894,6 +1894,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2015,6 +2018,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2136,6 +2142,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2257,6 +2266,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2378,6 +2390,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2499,6 +2514,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2620,6 +2638,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2741,6 +2762,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2862,6 +2886,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2983,6 +3010,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -3104,6 +3134,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_perf.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_perf.json
index 2967808..2c9faee 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_perf.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_perf.json
@@ -184,7 +184,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "{\n  \"bucket\": \"chromium-webrtc\",\n  \"configuration\": \"Release\",\n  \"gn_args\": [\n    \"is_debug=false\",\n    \"target_cpu=\\\"arm\\\"\",\n    \"use_goma=true\"\n  ],\n  \"tests\": [\n    {\n      \"app\": \"webrtc_perf_tests\",\n      \"bot id\": \"build15-a7\",\n      \"device type\": \"iPhone 7\",\n      \"max runtime seconds\": \"7200\",\n      \"os\": \"12.1.4\",\n      \"pool\": \"WebRTC\",\n      \"priority\": 30,\n      \"test args\": [\n        \"--save_chartjson_result\",\n        \"--nologs\"\n      ]\n    }\n  ],\n  \"xcode build version\": \"10l232m\"\n}",
+      "{\n  \"bucket\": \"chromium-webrtc\",\n  \"configuration\": \"Release\",\n  \"gn_args\": [\n    \"is_debug=false\",\n    \"target_cpu=\\\"arm\\\"\",\n    \"use_goma=true\"\n  ],\n  \"tests\": [\n    {\n      \"app\": \"webrtc_perf_tests\",\n      \"bot id\": \"build15-a7\",\n      \"device type\": \"iPhone 7\",\n      \"max runtime seconds\": 7200,\n      \"os\": \"12.1.4\",\n      \"pool\": \"WebRTC\",\n      \"priority\": 30,\n      \"test args\": [\n        \"--save_chartjson_result\",\n        \"--nologs\"\n      ]\n    }\n  ],\n  \"xcode build version\": \"10l232m\"\n}",
       "[CLEANUP]/ios_tmp_1/luci.webrtc-internal.ci/iOS64_Perf.json"
     ],
     "infra_step": true,
@@ -204,7 +204,7 @@
       "@@@STEP_LOG_LINE@iOS64_Perf.json@      \"app\": \"webrtc_perf_tests\",@@@",
       "@@@STEP_LOG_LINE@iOS64_Perf.json@      \"bot id\": \"build15-a7\",@@@",
       "@@@STEP_LOG_LINE@iOS64_Perf.json@      \"device type\": \"iPhone 7\",@@@",
-      "@@@STEP_LOG_LINE@iOS64_Perf.json@      \"max runtime seconds\": \"7200\",@@@",
+      "@@@STEP_LOG_LINE@iOS64_Perf.json@      \"max runtime seconds\": 7200,@@@",
       "@@@STEP_LOG_LINE@iOS64_Perf.json@      \"os\": \"12.1.4\",@@@",
       "@@@STEP_LOG_LINE@iOS64_Perf.json@      \"pool\": \"WebRTC\",@@@",
       "@@@STEP_LOG_LINE@iOS64_Perf.json@      \"priority\": 30,@@@",
@@ -243,7 +243,7 @@
       "@@@STEP_LOG_LINE@json.output@      \"app\": \"webrtc_perf_tests\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"bot id\": \"build15-a7\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"device type\": \"iPhone 7\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"max runtime seconds\": \"7200\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"max runtime seconds\": 7200, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"os\": \"12.1.4\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"pool\": \"WebRTC\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"priority\": 30, @@@",
@@ -956,6 +956,9 @@
       "--hard-timeout",
       "7200",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone9,1",
       "--dimension",
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_release.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_release.json
index 2773ae2..c9a4847 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_release.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_ci_ios64_release.json
@@ -1894,6 +1894,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2015,6 +2018,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2136,6 +2142,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2257,6 +2266,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2378,6 +2390,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2499,6 +2514,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2620,6 +2638,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2741,6 +2762,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2862,6 +2886,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2983,6 +3010,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -3104,6 +3134,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_dbg.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_dbg.json
index 9ff6df2..320a614 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_dbg.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_dbg.json
@@ -1939,6 +1939,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2064,6 +2067,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2189,6 +2195,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2314,6 +2323,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2439,6 +2451,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2564,6 +2579,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2689,6 +2707,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2814,6 +2835,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2939,6 +2963,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -3064,6 +3091,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -3189,6 +3219,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_perf.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_perf.json
index 51327b6..5cc8e7e 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_perf.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_perf.json
@@ -229,7 +229,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "{\n  \"bucket\": \"chromium-webrtc\",\n  \"configuration\": \"Release\",\n  \"gn_args\": [\n    \"is_debug=false\",\n    \"target_cpu=\\\"arm\\\"\",\n    \"use_goma=true\"\n  ],\n  \"tests\": [\n    {\n      \"app\": \"webrtc_perf_tests\",\n      \"bot id\": \"build16-a7\",\n      \"device type\": \"iPhone 7\",\n      \"max runtime seconds\": \"7200\",\n      \"os\": \"12.1.4\",\n      \"pool\": \"WebRTC\",\n      \"priority\": 30,\n      \"test args\": [\n        \"--save_chartjson_result\",\n        \"--nologs\"\n      ]\n    }\n  ],\n  \"xcode build version\": \"10l232m\"\n}",
+      "{\n  \"bucket\": \"chromium-webrtc\",\n  \"configuration\": \"Release\",\n  \"gn_args\": [\n    \"is_debug=false\",\n    \"target_cpu=\\\"arm\\\"\",\n    \"use_goma=true\"\n  ],\n  \"tests\": [\n    {\n      \"app\": \"webrtc_perf_tests\",\n      \"bot id\": \"build16-a7\",\n      \"device type\": \"iPhone 7\",\n      \"max runtime seconds\": 7200,\n      \"os\": \"12.1.4\",\n      \"pool\": \"WebRTC\",\n      \"priority\": 30,\n      \"test args\": [\n        \"--save_chartjson_result\",\n        \"--nologs\"\n      ]\n    }\n  ],\n  \"xcode build version\": \"10l232m\"\n}",
       "[CLEANUP]/ios_tmp_1/luci.webrtc-internal.try/ios_arm64_perf.json"
     ],
     "infra_step": true,
@@ -249,7 +249,7 @@
       "@@@STEP_LOG_LINE@ios_arm64_perf.json@      \"app\": \"webrtc_perf_tests\",@@@",
       "@@@STEP_LOG_LINE@ios_arm64_perf.json@      \"bot id\": \"build16-a7\",@@@",
       "@@@STEP_LOG_LINE@ios_arm64_perf.json@      \"device type\": \"iPhone 7\",@@@",
-      "@@@STEP_LOG_LINE@ios_arm64_perf.json@      \"max runtime seconds\": \"7200\",@@@",
+      "@@@STEP_LOG_LINE@ios_arm64_perf.json@      \"max runtime seconds\": 7200,@@@",
       "@@@STEP_LOG_LINE@ios_arm64_perf.json@      \"os\": \"12.1.4\",@@@",
       "@@@STEP_LOG_LINE@ios_arm64_perf.json@      \"pool\": \"WebRTC\",@@@",
       "@@@STEP_LOG_LINE@ios_arm64_perf.json@      \"priority\": 30,@@@",
@@ -288,7 +288,7 @@
       "@@@STEP_LOG_LINE@json.output@      \"app\": \"webrtc_perf_tests\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"bot id\": \"build16-a7\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"device type\": \"iPhone 7\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"max runtime seconds\": \"7200\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"max runtime seconds\": 7200, @@@",
       "@@@STEP_LOG_LINE@json.output@      \"os\": \"12.1.4\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"pool\": \"WebRTC\", @@@",
       "@@@STEP_LOG_LINE@json.output@      \"priority\": 30, @@@",
@@ -1001,6 +1001,9 @@
       "--hard-timeout",
       "7200",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone9,1",
       "--dimension",
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_rel.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_rel.json
index 06bf458..c0051a9 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_rel.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_internal_try_ios_arm64_rel.json
@@ -1939,6 +1939,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2064,6 +2067,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2189,6 +2195,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2314,6 +2323,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2439,6 +2451,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2564,6 +2579,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2689,6 +2707,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2814,6 +2835,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -2939,6 +2963,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -3064,6 +3091,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
@@ -3189,6 +3219,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "device",
       "iPhone8,1",
       "--dimension",
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios10.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios10.json
index f6d4f8d..52bc9ba 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios10.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios10.json
@@ -2759,6 +2759,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2877,6 +2880,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2995,6 +3001,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3113,6 +3122,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3231,6 +3243,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3349,6 +3364,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3467,6 +3485,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3585,6 +3606,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3703,6 +3727,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3821,6 +3848,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3939,6 +3969,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4057,6 +4090,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4175,6 +4211,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4293,6 +4332,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4411,6 +4453,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4529,6 +4574,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4647,6 +4695,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4765,6 +4816,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios11.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios11.json
index eab12e9..e556437 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios11.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios11.json
@@ -2759,6 +2759,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2877,6 +2880,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2995,6 +3001,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3113,6 +3122,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3231,6 +3243,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3349,6 +3364,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3467,6 +3485,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3585,6 +3606,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3703,6 +3727,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3821,6 +3848,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3939,6 +3969,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4057,6 +4090,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4175,6 +4211,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4293,6 +4332,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4411,6 +4453,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4529,6 +4574,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4647,6 +4695,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4765,6 +4816,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
diff --git a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios12.json b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios12.json
index 2ce3961..f3c9615 100644
--- a/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios12.json
+++ b/scripts/slave/recipes/webrtc/ios.expected/luci_webrtc_try_ios_sim_x64_dbg_ios12.json
@@ -2759,6 +2759,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2877,6 +2880,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -2995,6 +3001,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3113,6 +3122,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3231,6 +3243,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3349,6 +3364,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3467,6 +3485,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3585,6 +3606,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3703,6 +3727,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3821,6 +3848,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -3939,6 +3969,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4057,6 +4090,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4175,6 +4211,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4293,6 +4332,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4411,6 +4453,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4529,6 +4574,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4647,6 +4695,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
@@ -4765,6 +4816,9 @@
       "--hard-timeout",
       "3600",
       "--dimension",
+      "cpu",
+      "x86-64",
+      "--dimension",
       "os",
       "Mac-10.13",
       "--dimension",
diff --git a/scripts/slave/recipes/webrtc/ios.py b/scripts/slave/recipes/webrtc/ios.py
index 5086990..efe667a 100644
--- a/scripts/slave/recipes/webrtc/ios.py
+++ b/scripts/slave/recipes/webrtc/ios.py
@@ -345,7 +345,7 @@
           'os': '12.1.4',
           'bot id': 'build15-a7',
           'pool': 'WebRTC',
-          'max runtime seconds': '7200',
+          'max runtime seconds': 7200,
         },
       },
     },
@@ -420,7 +420,7 @@
           'os': '12.1.4',
           'bot id': 'build16-a7',
           'pool': 'WebRTC',
-          'max runtime seconds': '7200',
+          'max runtime seconds': 7200,
         },
       },
     },
diff --git a/scripts/slave/recipes/webrtc/more_configs.expected/luci_webrtc_ci_linux_more_configs.json b/scripts/slave/recipes/webrtc/more_configs.expected/luci_webrtc_ci_linux_more_configs.json
index 00b9b4c..49d2d96 100644
--- a/scripts/slave/recipes/webrtc/more_configs.expected/luci_webrtc_ci_linux_more_configs.json
+++ b/scripts/slave/recipes/webrtc/more_configs.expected/luci_webrtc_ci_linux_more_configs.json
@@ -1239,9 +1239,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1450,7 +1447,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/more_configs.expected/luci_webrtc_ci_win_more_configs.json b/scripts/slave/recipes/webrtc/more_configs.expected/luci_webrtc_ci_win_more_configs.json
index 06d9bb0..63e5692 100644
--- a/scripts/slave/recipes/webrtc/more_configs.expected/luci_webrtc_ci_win_more_configs.json
+++ b/scripts/slave/recipes/webrtc/more_configs.expected/luci_webrtc_ci_win_more_configs.json
@@ -1239,9 +1239,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1450,7 +1447,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/more_configs.expected/luci_webrtc_try_linux_more_configs.json b/scripts/slave/recipes/webrtc/more_configs.expected/luci_webrtc_try_linux_more_configs.json
index d58c677..4723425 100644
--- a/scripts/slave/recipes/webrtc/more_configs.expected/luci_webrtc_try_linux_more_configs.json
+++ b/scripts/slave/recipes/webrtc/more_configs.expected/luci_webrtc_try_linux_more_configs.json
@@ -1284,9 +1284,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1499,7 +1496,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/more_configs.expected/luci_webrtc_try_win_x86_more_configs.json b/scripts/slave/recipes/webrtc/more_configs.expected/luci_webrtc_try_win_x86_more_configs.json
index 98861bd..40ae910 100644
--- a/scripts/slave/recipes/webrtc/more_configs.expected/luci_webrtc_try_win_x86_more_configs.json
+++ b/scripts/slave/recipes/webrtc/more_configs.expected/luci_webrtc_try_win_x86_more_configs.json
@@ -1284,9 +1284,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1499,7 +1496,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux32_debug.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux32_debug.json
index 8626b39..c903012 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux32_debug.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux32_debug.json
@@ -633,9 +633,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -741,9 +738,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -849,9 +843,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -957,9 +948,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1069,9 +1057,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1181,9 +1166,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1293,9 +1275,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1405,9 +1384,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1517,9 +1493,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1629,9 +1602,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1741,9 +1711,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1853,9 +1820,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1965,9 +1929,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2077,9 +2038,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2189,9 +2147,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2301,9 +2256,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2409,9 +2361,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2517,9 +2466,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2625,9 +2571,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2737,9 +2680,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2849,9 +2789,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2961,9 +2898,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3073,9 +3007,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3185,9 +3116,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3297,9 +3225,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3405,9 +3330,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3513,9 +3435,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3621,9 +3540,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3729,9 +3645,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3841,9 +3754,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3953,9 +3863,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4065,9 +3972,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4177,9 +4081,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4285,9 +4186,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4496,7 +4394,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4638,7 +4535,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4780,7 +4676,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4922,7 +4817,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5070,7 +4964,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5244,7 +5137,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5414,7 +5306,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5562,7 +5453,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5704,7 +5594,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5846,7 +5735,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6018,7 +5906,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6170,7 +6057,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6312,7 +6198,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6454,7 +6339,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6596,7 +6480,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6756,7 +6639,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6904,7 +6786,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug.json
index 22e45f0..1e78731 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug.json
@@ -633,9 +633,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -741,9 +738,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -849,9 +843,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -957,9 +948,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1069,9 +1057,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1181,9 +1166,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1293,9 +1275,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1405,9 +1384,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1517,9 +1493,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1629,9 +1602,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1741,9 +1711,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1853,9 +1820,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1965,9 +1929,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2077,9 +2038,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2189,9 +2147,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2301,9 +2256,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2409,9 +2361,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2517,9 +2466,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2625,9 +2571,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2737,9 +2680,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2849,9 +2789,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2961,9 +2898,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3073,9 +3007,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3185,9 +3116,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3297,9 +3225,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3405,9 +3330,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3513,9 +3435,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3621,9 +3540,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3729,9 +3645,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3841,9 +3754,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3953,9 +3863,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4065,9 +3972,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4177,9 +4081,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4285,9 +4186,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4496,7 +4394,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4638,7 +4535,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4780,7 +4676,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4922,7 +4817,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5070,7 +4964,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5244,7 +5137,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5414,7 +5306,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5562,7 +5453,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5704,7 +5594,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5846,7 +5735,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6018,7 +5906,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6170,7 +6057,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6312,7 +6198,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6454,7 +6339,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6596,7 +6480,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6756,7 +6639,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6904,7 +6786,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_failing_test.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_failing_test.json
index a3db43f..c2530e6 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_failing_test.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_failing_test.json
@@ -633,9 +633,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -741,9 +738,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -849,9 +843,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -957,9 +948,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1069,9 +1057,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1181,9 +1166,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1293,9 +1275,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1405,9 +1384,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1517,9 +1493,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1629,9 +1602,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1741,9 +1711,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1853,9 +1820,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1965,9 +1929,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2077,9 +2038,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2189,9 +2147,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2301,9 +2256,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2409,9 +2361,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2517,9 +2466,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2625,9 +2571,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2737,9 +2680,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2849,9 +2789,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2961,9 +2898,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3073,9 +3007,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3185,9 +3116,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3297,9 +3225,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3405,9 +3330,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3513,9 +3435,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3621,9 +3540,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3729,9 +3645,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3841,9 +3754,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3953,9 +3863,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4065,9 +3972,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4177,9 +4081,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4285,9 +4186,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4496,7 +4394,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4638,7 +4535,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4780,7 +4676,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4922,7 +4817,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5070,7 +4964,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5244,7 +5137,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5414,7 +5306,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5562,7 +5453,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5704,7 +5594,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5846,7 +5735,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5969,7 +5857,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6093,7 +5980,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6235,7 +6121,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6377,7 +6262,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6519,7 +6403,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6679,7 +6562,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6827,7 +6709,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_forced.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_forced.json
index 22e45f0..1e78731 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_forced.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_debug_forced.json
@@ -633,9 +633,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -741,9 +738,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -849,9 +843,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -957,9 +948,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1069,9 +1057,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1181,9 +1166,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1293,9 +1275,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1405,9 +1384,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1517,9 +1493,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1629,9 +1602,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1741,9 +1711,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1853,9 +1820,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1965,9 +1929,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2077,9 +2038,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2189,9 +2147,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2301,9 +2256,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2409,9 +2361,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2517,9 +2466,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2625,9 +2571,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2737,9 +2680,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2849,9 +2789,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2961,9 +2898,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3073,9 +3007,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3185,9 +3116,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3297,9 +3225,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3405,9 +3330,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3513,9 +3435,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3621,9 +3540,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3729,9 +3645,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3841,9 +3754,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3953,9 +3863,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4065,9 +3972,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4177,9 +4081,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4285,9 +4186,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4496,7 +4394,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4638,7 +4535,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4780,7 +4676,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4922,7 +4817,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5070,7 +4964,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5244,7 +5137,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5414,7 +5306,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5562,7 +5453,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5704,7 +5594,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5846,7 +5735,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6018,7 +5906,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6170,7 +6057,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6312,7 +6198,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6454,7 +6339,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6596,7 +6480,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6756,7 +6639,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6904,7 +6786,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_release.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_release.json
index 2b8da3d..1e67bb8 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_release.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux64_release.json
@@ -638,9 +638,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -746,9 +743,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -854,9 +848,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -962,9 +953,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1074,9 +1062,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1186,9 +1171,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1298,9 +1280,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1410,9 +1389,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1522,9 +1498,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1634,9 +1607,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1746,9 +1716,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1858,9 +1825,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1970,9 +1934,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2082,9 +2043,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2194,9 +2152,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2306,9 +2261,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2414,9 +2366,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2522,9 +2471,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2630,9 +2576,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2742,9 +2685,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2854,9 +2794,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2966,9 +2903,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3078,9 +3012,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3190,9 +3121,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3302,9 +3230,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3410,9 +3335,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3518,9 +3440,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3626,9 +3545,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3734,9 +3650,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3846,9 +3759,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3958,9 +3868,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4070,9 +3977,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4182,9 +4086,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4290,9 +4191,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4606,7 +4504,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4748,7 +4645,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4890,7 +4786,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5032,7 +4927,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5180,7 +5074,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5354,7 +5247,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5524,7 +5416,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5672,7 +5563,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5814,7 +5704,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5956,7 +5845,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6128,7 +6016,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6280,7 +6167,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6422,7 +6308,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6564,7 +6449,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6706,7 +6590,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6866,7 +6749,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7014,7 +6896,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_asan.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_asan.json
index e7c2b3a..2940c6c 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_asan.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_asan.json
@@ -660,9 +660,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -768,9 +765,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -876,9 +870,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -984,9 +975,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1096,9 +1084,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1208,9 +1193,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1320,9 +1302,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1432,9 +1411,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1544,9 +1520,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1656,9 +1629,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1768,9 +1738,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1880,9 +1847,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1992,9 +1956,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2104,9 +2065,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2216,9 +2174,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2328,9 +2283,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2436,9 +2388,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2544,9 +2493,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2652,9 +2598,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2764,9 +2707,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2876,9 +2816,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2988,9 +2925,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3100,9 +3034,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3212,9 +3143,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3324,9 +3252,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3432,9 +3357,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3540,9 +3462,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3648,9 +3567,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3756,9 +3672,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3868,9 +3781,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3980,9 +3890,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4092,9 +3999,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4204,9 +4108,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4312,9 +4213,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4523,7 +4421,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4665,7 +4562,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4807,7 +4703,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4949,7 +4844,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5097,7 +4991,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5271,7 +5164,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5441,7 +5333,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5589,7 +5480,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5731,7 +5621,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5873,7 +5762,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6045,7 +5933,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6197,7 +6084,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6339,7 +6225,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6481,7 +6366,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6623,7 +6507,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6783,7 +6666,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6931,7 +6813,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_msan.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_msan.json
index 71337e3..399ee0b 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_msan.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_msan.json
@@ -660,9 +660,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -768,9 +765,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -876,9 +870,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -984,9 +975,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1096,9 +1084,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1208,9 +1193,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1320,9 +1302,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1432,9 +1411,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1544,9 +1520,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1656,9 +1629,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1768,9 +1738,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1880,9 +1847,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1992,9 +1956,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2104,9 +2065,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2216,9 +2174,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2328,9 +2283,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2436,9 +2388,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2544,9 +2493,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2652,9 +2598,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2764,9 +2707,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2876,9 +2816,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2988,9 +2925,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3100,9 +3034,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3212,9 +3143,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3324,9 +3252,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3432,9 +3357,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3540,9 +3462,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3648,9 +3567,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3756,9 +3672,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3868,9 +3781,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3980,9 +3890,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4092,9 +3999,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4204,9 +4108,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4312,9 +4213,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4523,7 +4421,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4665,7 +4562,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4807,7 +4703,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4949,7 +4844,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5097,7 +4991,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5271,7 +5164,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5441,7 +5333,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5589,7 +5480,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5731,7 +5621,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5873,7 +5762,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6045,7 +5933,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6197,7 +6084,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6339,7 +6225,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6481,7 +6366,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6623,7 +6507,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6783,7 +6666,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6931,7 +6813,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_tsan_v2.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_tsan_v2.json
index f6c9bc2..1c23f49 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_tsan_v2.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_tsan_v2.json
@@ -660,9 +660,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -768,9 +765,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -876,9 +870,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -984,9 +975,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1096,9 +1084,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1208,9 +1193,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1320,9 +1302,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1432,9 +1411,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1544,9 +1520,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1656,9 +1629,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1768,9 +1738,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1880,9 +1847,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1992,9 +1956,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2104,9 +2065,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2216,9 +2174,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2328,9 +2283,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2436,9 +2388,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2544,9 +2493,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2652,9 +2598,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2764,9 +2707,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2876,9 +2816,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2988,9 +2925,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3100,9 +3034,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3212,9 +3143,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3324,9 +3252,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3432,9 +3357,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3540,9 +3462,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3648,9 +3567,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3756,9 +3672,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3868,9 +3781,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3980,9 +3890,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4092,9 +3999,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4204,9 +4108,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4312,9 +4213,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4523,7 +4421,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4665,7 +4562,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4807,7 +4703,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4949,7 +4844,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5097,7 +4991,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5271,7 +5164,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5441,7 +5333,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5589,7 +5480,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5731,7 +5621,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5873,7 +5762,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6045,7 +5933,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6197,7 +6084,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6339,7 +6225,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6481,7 +6366,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6623,7 +6507,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6783,7 +6666,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6931,7 +6813,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_ubsan.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_ubsan.json
index fbf967b..448cb16 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_ubsan.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_ubsan.json
@@ -660,9 +660,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -768,9 +765,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -876,9 +870,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -984,9 +975,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1096,9 +1084,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1208,9 +1193,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1320,9 +1302,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1432,9 +1411,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1544,9 +1520,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1656,9 +1629,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1768,9 +1738,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1880,9 +1847,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1992,9 +1956,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2104,9 +2065,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2216,9 +2174,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2328,9 +2283,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2436,9 +2388,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2544,9 +2493,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2652,9 +2598,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2764,9 +2707,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2876,9 +2816,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2988,9 +2925,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3100,9 +3034,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3212,9 +3143,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3324,9 +3252,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3432,9 +3357,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3540,9 +3462,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3648,9 +3567,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3756,9 +3672,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3868,9 +3781,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3980,9 +3890,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4092,9 +3999,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4204,9 +4108,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4312,9 +4213,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4523,7 +4421,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4665,7 +4562,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4807,7 +4703,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4949,7 +4844,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5097,7 +4991,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5271,7 +5164,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5441,7 +5333,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5589,7 +5480,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5731,7 +5621,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5873,7 +5762,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6045,7 +5933,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6197,7 +6084,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6339,7 +6225,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6481,7 +6366,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6623,7 +6507,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6783,7 +6666,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6931,7 +6813,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_ubsan_vptr.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_ubsan_vptr.json
index eed262d..85aef89 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_ubsan_vptr.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_linux_ubsan_vptr.json
@@ -660,9 +660,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -768,9 +765,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -876,9 +870,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -984,9 +975,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1096,9 +1084,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1208,9 +1193,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1320,9 +1302,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1432,9 +1411,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1544,9 +1520,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1656,9 +1629,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1768,9 +1738,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1880,9 +1847,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1992,9 +1956,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2104,9 +2065,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2216,9 +2174,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2328,9 +2283,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2436,9 +2388,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2544,9 +2493,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2652,9 +2598,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2764,9 +2707,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2876,9 +2816,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2988,9 +2925,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3100,9 +3034,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3212,9 +3143,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3324,9 +3252,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3432,9 +3357,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3540,9 +3462,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3648,9 +3567,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3756,9 +3672,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3868,9 +3781,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3980,9 +3890,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4092,9 +3999,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4204,9 +4108,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4312,9 +4213,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4523,7 +4421,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4665,7 +4562,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4807,7 +4703,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4949,7 +4844,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5097,7 +4991,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5271,7 +5164,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5441,7 +5333,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5589,7 +5480,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5731,7 +5621,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5873,7 +5762,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6045,7 +5933,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6197,7 +6084,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6339,7 +6225,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6481,7 +6366,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6623,7 +6507,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6783,7 +6666,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6931,7 +6813,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_debug.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_debug.json
index 897d833..b53dd8d 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_debug.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_debug.json
@@ -695,9 +695,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -803,9 +800,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -911,9 +905,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1019,9 +1010,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1131,9 +1119,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1243,9 +1228,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1355,9 +1337,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1467,9 +1446,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1579,9 +1555,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1691,9 +1664,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1803,9 +1773,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1915,9 +1882,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2027,9 +1991,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2139,9 +2100,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2251,9 +2209,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2363,9 +2318,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2471,9 +2423,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2579,9 +2528,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2687,9 +2633,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2799,9 +2742,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2911,9 +2851,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3023,9 +2960,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3135,9 +3069,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3247,9 +3178,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3359,9 +3287,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3467,9 +3392,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3575,9 +3497,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3683,9 +3602,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3791,9 +3707,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3903,9 +3816,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4015,9 +3925,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4127,9 +4034,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4239,9 +4143,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4347,9 +4248,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4558,7 +4456,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4700,7 +4597,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4842,7 +4738,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4984,7 +4879,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5132,7 +5026,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5306,7 +5199,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5476,7 +5368,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5624,7 +5515,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5766,7 +5656,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5908,7 +5797,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6080,7 +5968,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6232,7 +6119,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6374,7 +6260,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6516,7 +6401,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6658,7 +6542,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6818,7 +6701,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6966,7 +6848,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_release.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_release.json
index 9663549..47228e1 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_release.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac64_release.json
@@ -700,9 +700,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -808,9 +805,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -916,9 +910,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1024,9 +1015,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1136,9 +1124,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1248,9 +1233,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1360,9 +1342,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1472,9 +1451,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1584,9 +1560,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1696,9 +1669,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1808,9 +1778,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1920,9 +1887,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2032,9 +1996,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2144,9 +2105,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2256,9 +2214,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2368,9 +2323,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2476,9 +2428,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2584,9 +2533,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2692,9 +2638,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2804,9 +2747,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2916,9 +2856,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3028,9 +2965,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3140,9 +3074,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3252,9 +3183,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3364,9 +3292,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3472,9 +3397,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3580,9 +3502,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3688,9 +3607,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3796,9 +3712,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3908,9 +3821,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4020,9 +3930,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4132,9 +4039,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4244,9 +4148,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4352,9 +4253,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4668,7 +4566,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4810,7 +4707,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4952,7 +4848,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5094,7 +4989,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5242,7 +5136,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5416,7 +5309,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5586,7 +5478,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5734,7 +5625,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5876,7 +5766,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6018,7 +5907,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6190,7 +6078,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6342,7 +6229,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6484,7 +6370,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6626,7 +6511,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6768,7 +6652,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6928,7 +6811,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7076,7 +6958,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac_asan.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac_asan.json
index 12054ec..6e7c2c6 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac_asan.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_mac_asan.json
@@ -695,9 +695,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -803,9 +800,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -911,9 +905,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1019,9 +1010,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1131,9 +1119,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1243,9 +1228,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1355,9 +1337,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1467,9 +1446,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1579,9 +1555,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1691,9 +1664,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1803,9 +1773,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1915,9 +1882,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2027,9 +1991,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2139,9 +2100,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2251,9 +2209,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2363,9 +2318,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2471,9 +2423,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2579,9 +2528,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2687,9 +2633,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2799,9 +2742,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2911,9 +2851,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3023,9 +2960,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3135,9 +3069,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3247,9 +3178,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3359,9 +3287,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3467,9 +3392,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3575,9 +3497,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3683,9 +3602,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3791,9 +3707,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3903,9 +3816,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4015,9 +3925,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4127,9 +4034,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4239,9 +4143,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4347,9 +4248,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4558,7 +4456,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4700,7 +4597,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4842,7 +4738,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4984,7 +4879,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5132,7 +5026,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5306,7 +5199,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5476,7 +5368,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5624,7 +5515,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5766,7 +5656,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5908,7 +5797,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6080,7 +5968,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6232,7 +6119,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6374,7 +6260,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6516,7 +6401,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6658,7 +6542,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6818,7 +6701,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6966,7 +6848,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_debug.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_debug.json
index 8d756b7..02ae5c6 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_debug.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_debug.json
@@ -647,9 +647,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -755,9 +752,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -863,9 +857,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -971,9 +962,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1083,9 +1071,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1195,9 +1180,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1307,9 +1289,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1419,9 +1398,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1531,9 +1507,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1643,9 +1616,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1755,9 +1725,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1867,9 +1834,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1979,9 +1943,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2091,9 +2052,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2203,9 +2161,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2315,9 +2270,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2423,9 +2375,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2531,9 +2480,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2639,9 +2585,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2751,9 +2694,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2863,9 +2803,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2975,9 +2912,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3087,9 +3021,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3199,9 +3130,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3311,9 +3239,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3419,9 +3344,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3527,9 +3449,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3635,9 +3554,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3743,9 +3659,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3855,9 +3768,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3967,9 +3877,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4079,9 +3986,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4191,9 +4095,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4299,9 +4200,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4510,7 +4408,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4652,7 +4549,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4794,7 +4690,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4936,7 +4831,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5084,7 +4978,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5258,7 +5151,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5428,7 +5320,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5576,7 +5467,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5718,7 +5608,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5860,7 +5749,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6032,7 +5920,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6184,7 +6071,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6326,7 +6212,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6468,7 +6353,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6610,7 +6494,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6770,7 +6653,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6918,7 +6800,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_release.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_release.json
index ff89ec8..07d3798 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_release.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_release.json
@@ -652,9 +652,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -760,9 +757,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -868,9 +862,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -976,9 +967,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1088,9 +1076,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1200,9 +1185,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1312,9 +1294,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1424,9 +1403,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1536,9 +1512,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1648,9 +1621,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1760,9 +1730,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1872,9 +1839,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1984,9 +1948,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2096,9 +2057,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2208,9 +2166,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2320,9 +2275,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2428,9 +2380,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2536,9 +2485,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2644,9 +2590,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2756,9 +2699,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2868,9 +2808,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2980,9 +2917,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3092,9 +3026,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3204,9 +3135,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3316,9 +3244,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3424,9 +3349,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3532,9 +3454,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3640,9 +3559,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3748,9 +3664,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3860,9 +3773,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3972,9 +3882,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4084,9 +3991,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4196,9 +4100,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4304,9 +4205,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4620,7 +4518,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4762,7 +4659,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4904,7 +4800,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5046,7 +4941,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5194,7 +5088,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5368,7 +5261,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5538,7 +5430,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5686,7 +5577,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5828,7 +5718,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5970,7 +5859,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6142,7 +6030,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6294,7 +6181,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6436,7 +6322,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6578,7 +6463,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6720,7 +6604,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6880,7 +6763,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7028,7 +6910,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_release_clang.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_release_clang.json
index 13c276a..c74581a 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_release_clang.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win32_release_clang.json
@@ -679,9 +679,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -787,9 +784,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -895,9 +889,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1003,9 +994,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1115,9 +1103,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1227,9 +1212,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1339,9 +1321,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1451,9 +1430,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1563,9 +1539,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1675,9 +1648,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1787,9 +1757,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1899,9 +1866,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2011,9 +1975,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2123,9 +2084,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2235,9 +2193,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2347,9 +2302,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2455,9 +2407,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2563,9 +2512,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2671,9 +2617,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2783,9 +2726,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2895,9 +2835,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3007,9 +2944,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3119,9 +3053,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3231,9 +3162,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3343,9 +3271,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3451,9 +3376,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3559,9 +3481,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3667,9 +3586,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3775,9 +3691,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3887,9 +3800,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3999,9 +3909,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4111,9 +4018,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4223,9 +4127,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4331,9 +4232,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4647,7 +4545,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4789,7 +4686,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4931,7 +4827,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5073,7 +4968,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5221,7 +5115,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5395,7 +5288,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5565,7 +5457,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5713,7 +5604,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5855,7 +5745,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5997,7 +5886,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6169,7 +6057,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6321,7 +6208,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6463,7 +6349,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6605,7 +6490,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6747,7 +6631,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6907,7 +6790,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7055,7 +6937,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_asan.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_asan.json
index ecf5e36..437a737 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_asan.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_asan.json
@@ -674,9 +674,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -782,9 +779,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -890,9 +884,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -998,9 +989,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1110,9 +1098,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1222,9 +1207,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1334,9 +1316,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1446,9 +1425,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1558,9 +1534,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1670,9 +1643,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1782,9 +1752,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1894,9 +1861,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2006,9 +1970,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2118,9 +2079,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2230,9 +2188,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2342,9 +2297,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2450,9 +2402,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2558,9 +2507,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2666,9 +2612,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2778,9 +2721,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2890,9 +2830,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3002,9 +2939,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3114,9 +3048,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3226,9 +3157,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3338,9 +3266,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3446,9 +3371,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3554,9 +3476,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3662,9 +3581,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3770,9 +3686,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3882,9 +3795,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3994,9 +3904,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -4106,9 +4013,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -4218,9 +4122,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -4326,9 +4227,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -4537,7 +4435,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4679,7 +4576,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4821,7 +4717,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4963,7 +4858,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5111,7 +5005,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5285,7 +5178,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5455,7 +5347,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5603,7 +5494,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5745,7 +5635,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5887,7 +5776,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6059,7 +5947,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6211,7 +6098,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6353,7 +6239,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6495,7 +6380,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6637,7 +6521,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6797,7 +6680,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6945,7 +6827,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_debug.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_debug.json
index 06688a8..b000091 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_debug.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_debug.json
@@ -647,9 +647,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -755,9 +752,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -863,9 +857,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -971,9 +962,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1083,9 +1071,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1195,9 +1180,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1307,9 +1289,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1419,9 +1398,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1531,9 +1507,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1643,9 +1616,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1755,9 +1725,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1867,9 +1834,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1979,9 +1943,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2091,9 +2052,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2203,9 +2161,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2315,9 +2270,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2423,9 +2375,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2531,9 +2480,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2639,9 +2585,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2751,9 +2694,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2863,9 +2803,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2975,9 +2912,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3087,9 +3021,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3199,9 +3130,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3311,9 +3239,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3419,9 +3344,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3527,9 +3449,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3635,9 +3554,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3743,9 +3659,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3855,9 +3768,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3967,9 +3877,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4079,9 +3986,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4191,9 +4095,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4299,9 +4200,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4510,7 +4408,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4652,7 +4549,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4794,7 +4690,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4936,7 +4831,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5084,7 +4978,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5258,7 +5151,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5428,7 +5320,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5576,7 +5467,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5718,7 +5608,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5860,7 +5749,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6032,7 +5920,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6184,7 +6071,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6326,7 +6212,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6468,7 +6353,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6610,7 +6494,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6770,7 +6653,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6918,7 +6800,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_release.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_release.json
index 0287306..fad6842 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_release.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_ci_win64_release.json
@@ -647,9 +647,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -755,9 +752,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -863,9 +857,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -971,9 +962,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1083,9 +1071,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1195,9 +1180,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1307,9 +1289,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1419,9 +1398,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1531,9 +1507,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1643,9 +1616,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1755,9 +1725,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1867,9 +1834,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1979,9 +1943,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2091,9 +2052,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2203,9 +2161,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2315,9 +2270,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2423,9 +2375,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2531,9 +2480,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2639,9 +2585,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2751,9 +2694,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2863,9 +2803,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2975,9 +2912,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3087,9 +3021,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3199,9 +3130,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3311,9 +3239,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3419,9 +3344,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3527,9 +3449,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3635,9 +3554,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3743,9 +3659,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3855,9 +3768,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3967,9 +3877,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4079,9 +3986,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4191,9 +4095,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4299,9 +4200,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4510,7 +4408,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4652,7 +4549,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4794,7 +4690,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4936,7 +4831,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5084,7 +4978,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5258,7 +5151,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5428,7 +5320,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5576,7 +5467,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5718,7 +5608,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5860,7 +5749,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6032,7 +5920,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6184,7 +6071,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6326,7 +6212,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6468,7 +6353,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6610,7 +6494,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6770,7 +6653,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6918,7 +6800,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_asan.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_asan.json
index 14fc37c..681f92b 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_asan.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_asan.json
@@ -705,9 +705,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -817,9 +814,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -929,9 +923,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1041,9 +1032,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1157,9 +1145,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1273,9 +1258,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1389,9 +1371,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1505,9 +1484,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1621,9 +1597,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1737,9 +1710,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1853,9 +1823,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1969,9 +1936,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2085,9 +2049,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2201,9 +2162,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2317,9 +2275,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2433,9 +2388,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2545,9 +2497,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2657,9 +2606,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2769,9 +2715,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2885,9 +2828,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3001,9 +2941,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3117,9 +3054,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3233,9 +3167,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3349,9 +3280,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3465,9 +3393,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3577,9 +3502,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3689,9 +3611,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3801,9 +3720,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3913,9 +3829,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4029,9 +3942,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4145,9 +4055,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4261,9 +4168,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4377,9 +4281,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4489,9 +4390,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4704,7 +4602,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4846,7 +4743,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4988,7 +4884,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5130,7 +5025,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5278,7 +5172,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5452,7 +5345,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5622,7 +5514,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5770,7 +5661,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5912,7 +5802,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6054,7 +5943,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6226,7 +6114,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6378,7 +6265,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6520,7 +6406,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6662,7 +6547,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6804,7 +6688,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6964,7 +6847,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7112,7 +6994,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_dbg.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_dbg.json
index 69654550..03b889e 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_dbg.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_dbg.json
@@ -678,9 +678,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -790,9 +787,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -902,9 +896,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1014,9 +1005,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1130,9 +1118,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1246,9 +1231,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1362,9 +1344,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1478,9 +1457,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1594,9 +1570,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1710,9 +1683,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1826,9 +1796,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1942,9 +1909,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2058,9 +2022,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2174,9 +2135,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2290,9 +2248,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2406,9 +2361,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2518,9 +2470,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2630,9 +2579,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2742,9 +2688,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2858,9 +2801,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2974,9 +2914,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3090,9 +3027,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3206,9 +3140,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3322,9 +3253,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3438,9 +3366,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3550,9 +3475,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3662,9 +3584,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3774,9 +3693,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3886,9 +3802,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4002,9 +3915,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4118,9 +4028,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4234,9 +4141,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4350,9 +4254,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4462,9 +4363,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4677,7 +4575,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4819,7 +4716,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4961,7 +4857,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5103,7 +4998,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5251,7 +5145,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5425,7 +5318,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5595,7 +5487,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5743,7 +5634,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5885,7 +5775,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6027,7 +5916,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6199,7 +6087,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6351,7 +6238,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6493,7 +6379,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6635,7 +6520,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6777,7 +6661,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6937,7 +6820,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7085,7 +6967,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_memcheck.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_memcheck.json
index 4570394..768fbe2 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_memcheck.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_memcheck.json
@@ -678,9 +678,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -790,9 +787,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -902,9 +896,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1014,9 +1005,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1130,9 +1118,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1246,9 +1231,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1362,9 +1344,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1478,9 +1457,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1594,9 +1570,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1710,9 +1683,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1826,9 +1796,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1942,9 +1909,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2058,9 +2022,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2174,9 +2135,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2290,9 +2248,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2406,9 +2361,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2518,9 +2470,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2630,9 +2579,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2742,9 +2688,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2858,9 +2801,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2974,9 +2914,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3090,9 +3027,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3206,9 +3140,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3322,9 +3253,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3438,9 +3366,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3550,9 +3475,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3662,9 +3584,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3774,9 +3693,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3886,9 +3802,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4002,9 +3915,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4118,9 +4028,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4234,9 +4141,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4350,9 +4254,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4462,9 +4363,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4677,7 +4575,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4819,7 +4716,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4961,7 +4857,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5103,7 +4998,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5251,7 +5145,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5425,7 +5318,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5595,7 +5487,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5743,7 +5634,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5885,7 +5775,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6027,7 +5916,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6199,7 +6087,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6351,7 +6238,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6493,7 +6379,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6635,7 +6520,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6777,7 +6661,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6937,7 +6820,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7085,7 +6967,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_msan.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_msan.json
index 5a91361..a7f0fa8 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_msan.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_msan.json
@@ -705,9 +705,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -817,9 +814,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -929,9 +923,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1041,9 +1032,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1157,9 +1145,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1273,9 +1258,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1389,9 +1371,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1505,9 +1484,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1621,9 +1597,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1737,9 +1710,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1853,9 +1823,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1969,9 +1936,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2085,9 +2049,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2201,9 +2162,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2317,9 +2275,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2433,9 +2388,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2545,9 +2497,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2657,9 +2606,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2769,9 +2715,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2885,9 +2828,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3001,9 +2941,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3117,9 +3054,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3233,9 +3167,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3349,9 +3280,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3465,9 +3393,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3577,9 +3502,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3689,9 +3611,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3801,9 +3720,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3913,9 +3829,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4029,9 +3942,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4145,9 +4055,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4261,9 +4168,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4377,9 +4281,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4489,9 +4390,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4704,7 +4602,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4846,7 +4743,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4988,7 +4884,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5130,7 +5025,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5278,7 +5172,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5452,7 +5345,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5622,7 +5514,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5770,7 +5661,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5912,7 +5802,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6054,7 +5943,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6226,7 +6114,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6378,7 +6265,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6520,7 +6406,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6662,7 +6547,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6804,7 +6688,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6964,7 +6847,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7112,7 +6994,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_rel.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_rel.json
index f3230c2..756eebc 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_rel.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_rel.json
@@ -693,9 +693,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -805,9 +802,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -917,9 +911,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1029,9 +1020,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1145,9 +1133,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1261,9 +1246,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1377,9 +1359,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1493,9 +1472,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1609,9 +1585,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1725,9 +1698,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1841,9 +1811,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1957,9 +1924,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2073,9 +2037,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2189,9 +2150,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2305,9 +2263,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2421,9 +2376,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2533,9 +2485,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2645,9 +2594,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2757,9 +2703,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2873,9 +2816,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2989,9 +2929,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3105,9 +3042,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3221,9 +3155,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3337,9 +3268,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3453,9 +3381,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3565,9 +3490,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3677,9 +3599,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3789,9 +3708,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3901,9 +3817,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4017,9 +3930,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4133,9 +4043,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4249,9 +4156,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4365,9 +4269,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4477,9 +4378,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -5021,7 +4919,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5163,7 +5060,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5305,7 +5201,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5447,7 +5342,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5595,7 +5489,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5769,7 +5662,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5939,7 +5831,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6087,7 +5978,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6229,7 +6119,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6371,7 +6260,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6543,7 +6431,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6695,7 +6582,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6837,7 +6723,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6979,7 +6864,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7121,7 +7005,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7281,7 +7164,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7429,7 +7311,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_tsan2.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_tsan2.json
index d42dc92..f726f9b 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_tsan2.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_tsan2.json
@@ -705,9 +705,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -817,9 +814,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -929,9 +923,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1041,9 +1032,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1157,9 +1145,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1273,9 +1258,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1389,9 +1371,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1505,9 +1484,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1621,9 +1597,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1737,9 +1710,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1853,9 +1823,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1969,9 +1936,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2085,9 +2049,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2201,9 +2162,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2317,9 +2275,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2433,9 +2388,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2545,9 +2497,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2657,9 +2606,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2769,9 +2715,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2885,9 +2828,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3001,9 +2941,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3117,9 +3054,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3233,9 +3167,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3349,9 +3280,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3465,9 +3393,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3577,9 +3502,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3689,9 +3611,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3801,9 +3720,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3913,9 +3829,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4029,9 +3942,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4145,9 +4055,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4261,9 +4168,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4377,9 +4281,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4489,9 +4390,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4704,7 +4602,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4846,7 +4743,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4988,7 +4884,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5130,7 +5025,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5278,7 +5172,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5452,7 +5345,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5622,7 +5514,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5770,7 +5661,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5912,7 +5802,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6054,7 +5943,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6226,7 +6114,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6378,7 +6265,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6520,7 +6406,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6662,7 +6547,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6804,7 +6688,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6964,7 +6847,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7112,7 +6994,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_ubsan.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_ubsan.json
index 904fa2c..b32388a 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_ubsan.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_ubsan.json
@@ -705,9 +705,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -817,9 +814,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -929,9 +923,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1041,9 +1032,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1157,9 +1145,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1273,9 +1258,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1389,9 +1371,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1505,9 +1484,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1621,9 +1597,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1737,9 +1710,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1853,9 +1823,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1969,9 +1936,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2085,9 +2049,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2201,9 +2162,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2317,9 +2275,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2433,9 +2388,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2545,9 +2497,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2657,9 +2606,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2769,9 +2715,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2885,9 +2828,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3001,9 +2941,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3117,9 +3054,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3233,9 +3167,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3349,9 +3280,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3465,9 +3393,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3577,9 +3502,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3689,9 +3611,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3801,9 +3720,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3913,9 +3829,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4029,9 +3942,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4145,9 +4055,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4261,9 +4168,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4377,9 +4281,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4489,9 +4390,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4704,7 +4602,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4846,7 +4743,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4988,7 +4884,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5130,7 +5025,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5278,7 +5172,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5452,7 +5345,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5622,7 +5514,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5770,7 +5661,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5912,7 +5802,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6054,7 +5943,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6226,7 +6114,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6378,7 +6265,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6520,7 +6406,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6662,7 +6547,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6804,7 +6688,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6964,7 +6847,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7112,7 +6994,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_ubsan_vptr.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_ubsan_vptr.json
index 58c4e39..f047c2d 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_ubsan_vptr.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_ubsan_vptr.json
@@ -705,9 +705,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -817,9 +814,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -929,9 +923,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1041,9 +1032,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1157,9 +1145,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1273,9 +1258,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1389,9 +1371,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1505,9 +1484,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1621,9 +1597,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1737,9 +1710,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1853,9 +1823,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1969,9 +1936,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2085,9 +2049,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2201,9 +2162,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2317,9 +2275,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2433,9 +2388,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2545,9 +2497,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2657,9 +2606,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2769,9 +2715,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2885,9 +2828,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3001,9 +2941,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3117,9 +3054,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3233,9 +3167,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3349,9 +3280,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3465,9 +3393,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3577,9 +3502,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3689,9 +3611,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3801,9 +3720,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3913,9 +3829,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4029,9 +3942,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4145,9 +4055,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4261,9 +4168,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4377,9 +4281,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4489,9 +4390,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4704,7 +4602,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4846,7 +4743,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4988,7 +4884,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5130,7 +5025,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5278,7 +5172,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5452,7 +5345,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5622,7 +5514,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5770,7 +5661,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5912,7 +5802,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6054,7 +5943,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6226,7 +6114,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6378,7 +6265,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6520,7 +6406,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6662,7 +6547,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6804,7 +6688,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6964,7 +6847,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7112,7 +6994,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_x86_dbg.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_x86_dbg.json
index 552795c..4a2acbd 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_x86_dbg.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_x86_dbg.json
@@ -678,9 +678,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -790,9 +787,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -902,9 +896,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1014,9 +1005,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1130,9 +1118,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1246,9 +1231,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1362,9 +1344,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1478,9 +1457,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1594,9 +1570,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1710,9 +1683,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1826,9 +1796,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1942,9 +1909,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2058,9 +2022,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2174,9 +2135,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2290,9 +2248,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2406,9 +2361,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2518,9 +2470,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2630,9 +2579,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2742,9 +2688,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2858,9 +2801,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2974,9 +2914,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3090,9 +3027,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3206,9 +3140,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3322,9 +3253,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3438,9 +3366,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3550,9 +3475,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3662,9 +3584,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3774,9 +3693,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3886,9 +3802,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4002,9 +3915,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4118,9 +4028,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4234,9 +4141,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4350,9 +4254,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4462,9 +4363,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4677,7 +4575,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4819,7 +4716,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4961,7 +4857,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5103,7 +4998,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5251,7 +5145,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5425,7 +5318,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5595,7 +5487,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5743,7 +5634,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5885,7 +5775,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6027,7 +5916,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6199,7 +6087,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6351,7 +6238,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6493,7 +6379,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6635,7 +6520,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6777,7 +6661,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6937,7 +6820,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7085,7 +6967,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_x86_rel.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_x86_rel.json
index 1786fcf..ad7e115 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_x86_rel.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_linux_x86_rel.json
@@ -678,9 +678,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -790,9 +787,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -902,9 +896,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1014,9 +1005,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1130,9 +1118,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1246,9 +1231,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1362,9 +1344,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1478,9 +1457,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1594,9 +1570,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1710,9 +1683,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1826,9 +1796,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -1942,9 +1909,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2058,9 +2022,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2174,9 +2135,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2290,9 +2248,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2406,9 +2361,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2518,9 +2470,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2630,9 +2579,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2742,9 +2688,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2858,9 +2801,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -2974,9 +2914,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3090,9 +3027,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3206,9 +3140,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3322,9 +3253,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3438,9 +3366,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3550,9 +3475,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3662,9 +3584,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3774,9 +3693,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -3886,9 +3802,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4002,9 +3915,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4118,9 +4028,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4234,9 +4141,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4350,9 +4254,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4462,9 +4363,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Ubuntu-14.04",
       "--dimension",
@@ -4677,7 +4575,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4819,7 +4716,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4961,7 +4857,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5103,7 +4998,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5251,7 +5145,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5425,7 +5318,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5595,7 +5487,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5743,7 +5634,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5885,7 +5775,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6027,7 +5916,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6199,7 +6087,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6351,7 +6238,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6493,7 +6379,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6635,7 +6520,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6777,7 +6661,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6937,7 +6820,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7085,7 +6967,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Ubuntu-14.04\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_asan.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_asan.json
index f3422a0..3443f2d 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_asan.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_asan.json
@@ -740,9 +740,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -852,9 +849,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -964,9 +958,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1076,9 +1067,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1192,9 +1180,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1308,9 +1293,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1424,9 +1406,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1540,9 +1519,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1656,9 +1632,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1772,9 +1745,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1888,9 +1858,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2004,9 +1971,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2120,9 +2084,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2236,9 +2197,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2352,9 +2310,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2468,9 +2423,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2580,9 +2532,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2692,9 +2641,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2804,9 +2750,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2920,9 +2863,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3036,9 +2976,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3152,9 +3089,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3268,9 +3202,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3384,9 +3315,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3500,9 +3428,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3612,9 +3537,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3724,9 +3646,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3836,9 +3755,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3948,9 +3864,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4064,9 +3977,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4180,9 +4090,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4296,9 +4203,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4412,9 +4316,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4524,9 +4425,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4739,7 +4637,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4881,7 +4778,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5023,7 +4919,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5165,7 +5060,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5313,7 +5207,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5487,7 +5380,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5657,7 +5549,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5805,7 +5696,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5947,7 +5837,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6089,7 +5978,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6261,7 +6149,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6413,7 +6300,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6555,7 +6441,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6697,7 +6582,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6839,7 +6723,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6999,7 +6882,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7147,7 +7029,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_dbg.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_dbg.json
index 53e9df0..33f3d80 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_dbg.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_dbg.json
@@ -740,9 +740,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -852,9 +849,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -964,9 +958,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1076,9 +1067,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1192,9 +1180,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1308,9 +1293,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1424,9 +1406,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1540,9 +1519,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1656,9 +1632,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1772,9 +1745,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1888,9 +1858,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2004,9 +1971,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2120,9 +2084,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2236,9 +2197,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2352,9 +2310,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2468,9 +2423,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2580,9 +2532,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2692,9 +2641,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2804,9 +2750,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2920,9 +2863,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3036,9 +2976,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3152,9 +3089,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3268,9 +3202,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3384,9 +3315,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3500,9 +3428,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3612,9 +3537,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3724,9 +3646,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3836,9 +3755,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3948,9 +3864,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4064,9 +3977,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4180,9 +4090,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4296,9 +4203,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4412,9 +4316,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4524,9 +4425,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4739,7 +4637,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4881,7 +4778,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5023,7 +4919,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5165,7 +5060,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5313,7 +5207,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5487,7 +5380,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5657,7 +5549,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5805,7 +5696,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5947,7 +5837,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6089,7 +5978,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6261,7 +6149,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6413,7 +6300,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6555,7 +6441,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6697,7 +6582,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6839,7 +6723,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6999,7 +6882,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7147,7 +7029,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_rel.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_rel.json
index 72e0096..fd9ecf8 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_rel.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_mac_rel.json
@@ -745,9 +745,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -857,9 +854,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -969,9 +963,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1081,9 +1072,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1197,9 +1185,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1313,9 +1298,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1429,9 +1411,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1545,9 +1524,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1661,9 +1637,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1777,9 +1750,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -1893,9 +1863,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2009,9 +1976,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2125,9 +2089,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2241,9 +2202,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2357,9 +2315,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2473,9 +2428,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2585,9 +2537,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2697,9 +2646,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2809,9 +2755,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -2925,9 +2868,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3041,9 +2981,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3157,9 +3094,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3273,9 +3207,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3389,9 +3320,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3505,9 +3433,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3617,9 +3542,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3729,9 +3651,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3841,9 +3760,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -3953,9 +3869,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4069,9 +3982,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4185,9 +4095,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4301,9 +4208,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4417,9 +4321,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4529,9 +4430,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Mac-10.11",
       "--dimension",
@@ -4853,7 +4751,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4995,7 +4892,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5137,7 +5033,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5279,7 +5174,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5427,7 +5321,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5601,7 +5494,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5771,7 +5663,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5919,7 +5810,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6061,7 +5951,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6203,7 +6092,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6375,7 +6263,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6527,7 +6414,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6669,7 +6555,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6811,7 +6696,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6953,7 +6837,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7113,7 +6996,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7261,7 +7143,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Mac-10.11\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_asan.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_asan.json
index 102b41d..3757edf 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_asan.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_asan.json
@@ -719,9 +719,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -831,9 +828,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -943,9 +937,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1055,9 +1046,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1171,9 +1159,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1287,9 +1272,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1403,9 +1385,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1519,9 +1498,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1635,9 +1611,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1751,9 +1724,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1867,9 +1837,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1983,9 +1950,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2099,9 +2063,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2215,9 +2176,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2331,9 +2289,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2447,9 +2402,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2559,9 +2511,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2671,9 +2620,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2783,9 +2729,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2899,9 +2842,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3015,9 +2955,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3131,9 +3068,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3247,9 +3181,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3363,9 +3294,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3479,9 +3407,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3591,9 +3516,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3703,9 +3625,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3815,9 +3734,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3927,9 +3843,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -4043,9 +3956,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -4159,9 +4069,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -4275,9 +4182,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -4391,9 +4295,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -4503,9 +4404,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -4718,7 +4616,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4860,7 +4757,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5002,7 +4898,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5144,7 +5039,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5292,7 +5186,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5466,7 +5359,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5636,7 +5528,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5784,7 +5675,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5926,7 +5816,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6068,7 +5957,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6240,7 +6128,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6392,7 +6279,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6534,7 +6420,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6676,7 +6561,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6818,7 +6702,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6978,7 +6861,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7126,7 +7008,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg.json
index b221f9e..0349c02 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg.json
@@ -719,9 +719,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -831,9 +828,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -943,9 +937,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1055,9 +1046,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1171,9 +1159,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1287,9 +1272,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1403,9 +1385,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1519,9 +1498,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1635,9 +1611,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1751,9 +1724,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1867,9 +1837,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1983,9 +1950,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2099,9 +2063,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2215,9 +2176,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2331,9 +2289,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2447,9 +2402,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2559,9 +2511,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2671,9 +2620,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2783,9 +2729,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2899,9 +2842,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3015,9 +2955,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3131,9 +3068,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3247,9 +3181,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3363,9 +3294,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3479,9 +3407,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3591,9 +3516,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3703,9 +3625,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3815,9 +3734,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3927,9 +3843,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4043,9 +3956,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4159,9 +4069,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4275,9 +4182,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4391,9 +4295,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4503,9 +4404,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4718,7 +4616,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4860,7 +4757,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5002,7 +4898,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5144,7 +5039,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5292,7 +5186,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5466,7 +5359,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5636,7 +5528,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5784,7 +5675,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5926,7 +5816,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6068,7 +5957,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6240,7 +6128,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6392,7 +6279,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6534,7 +6420,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6676,7 +6561,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6818,7 +6702,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6978,7 +6861,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7126,7 +7008,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg_win10.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg_win10.json
index 05181ab..cb2aa98 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg_win10.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg_win10.json
@@ -692,9 +692,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -804,9 +801,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -916,9 +910,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1028,9 +1019,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1144,9 +1132,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1260,9 +1245,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1376,9 +1358,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1492,9 +1471,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1608,9 +1584,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1724,9 +1697,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1840,9 +1810,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -1956,9 +1923,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2072,9 +2036,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2188,9 +2149,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2304,9 +2262,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2420,9 +2375,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2532,9 +2484,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2644,9 +2593,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2756,9 +2702,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2872,9 +2815,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -2988,9 +2928,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3104,9 +3041,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3220,9 +3154,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3336,9 +3267,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3452,9 +3380,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3564,9 +3489,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3676,9 +3598,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3788,9 +3707,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -3900,9 +3816,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -4016,9 +3929,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -4132,9 +4042,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -4248,9 +4155,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -4364,9 +4268,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -4476,9 +4377,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-10",
       "--dimension",
@@ -4691,7 +4589,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4833,7 +4730,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4975,7 +4871,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5117,7 +5012,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5265,7 +5159,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5439,7 +5332,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5609,7 +5501,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5757,7 +5648,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5899,7 +5789,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6041,7 +5930,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6213,7 +6101,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6365,7 +6252,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6507,7 +6393,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6649,7 +6534,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6791,7 +6675,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6951,7 +6834,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7099,7 +6981,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-10\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg_win8.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg_win8.json
index 18b82e4..f1fc92f 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg_win8.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_dbg_win8.json
@@ -692,9 +692,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -804,9 +801,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -916,9 +910,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -1028,9 +1019,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -1144,9 +1132,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -1260,9 +1245,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -1376,9 +1358,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -1492,9 +1471,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -1608,9 +1584,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -1724,9 +1697,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -1840,9 +1810,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -1956,9 +1923,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -2072,9 +2036,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -2188,9 +2149,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -2304,9 +2262,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -2420,9 +2375,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -2532,9 +2484,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -2644,9 +2593,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -2756,9 +2702,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -2872,9 +2815,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -2988,9 +2928,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -3104,9 +3041,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -3220,9 +3154,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -3336,9 +3267,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -3452,9 +3380,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -3564,9 +3489,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -3676,9 +3598,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -3788,9 +3707,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -3900,9 +3816,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -4016,9 +3929,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -4132,9 +4042,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -4248,9 +4155,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -4364,9 +4268,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -4476,9 +4377,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-8.1-SP0",
       "--dimension",
@@ -4691,7 +4589,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4833,7 +4730,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4975,7 +4871,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5117,7 +5012,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5265,7 +5159,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5439,7 +5332,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5609,7 +5501,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5757,7 +5648,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5899,7 +5789,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6041,7 +5930,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6213,7 +6101,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6365,7 +6252,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6507,7 +6393,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6649,7 +6534,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6791,7 +6675,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6951,7 +6834,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7099,7 +6981,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-8.1-SP0\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_rel.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_rel.json
index a2ea027..e247ba3 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_rel.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_clang_rel.json
@@ -719,9 +719,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -831,9 +828,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -943,9 +937,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1055,9 +1046,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1171,9 +1159,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1287,9 +1272,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1403,9 +1385,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1519,9 +1498,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1635,9 +1611,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1751,9 +1724,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1867,9 +1837,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1983,9 +1950,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2099,9 +2063,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2215,9 +2176,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2331,9 +2289,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2447,9 +2402,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2559,9 +2511,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2671,9 +2620,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2783,9 +2729,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2899,9 +2842,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3015,9 +2955,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3131,9 +3068,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3247,9 +3181,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3363,9 +3294,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3479,9 +3407,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3591,9 +3516,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3703,9 +3625,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3815,9 +3734,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3927,9 +3843,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4043,9 +3956,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4159,9 +4069,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4275,9 +4182,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4391,9 +4295,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4503,9 +4404,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4718,7 +4616,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4860,7 +4757,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5002,7 +4898,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5144,7 +5039,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5292,7 +5186,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5466,7 +5359,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5636,7 +5528,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5784,7 +5675,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5926,7 +5816,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6068,7 +5957,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6240,7 +6128,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6392,7 +6279,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6534,7 +6420,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6676,7 +6561,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6818,7 +6702,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6978,7 +6861,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7126,7 +7008,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_msvc_dbg.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_msvc_dbg.json
index 5e980a9..e3ca105 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_msvc_dbg.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_msvc_dbg.json
@@ -692,9 +692,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -804,9 +801,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -916,9 +910,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1028,9 +1019,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1144,9 +1132,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1260,9 +1245,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1376,9 +1358,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1492,9 +1471,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1608,9 +1584,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1724,9 +1697,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1840,9 +1810,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1956,9 +1923,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2072,9 +2036,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2188,9 +2149,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2304,9 +2262,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2420,9 +2375,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2532,9 +2484,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2644,9 +2593,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2756,9 +2702,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2872,9 +2815,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2988,9 +2928,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3104,9 +3041,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3220,9 +3154,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3336,9 +3267,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3452,9 +3380,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3564,9 +3489,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3676,9 +3598,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3788,9 +3707,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3900,9 +3816,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4016,9 +3929,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4132,9 +4042,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4248,9 +4155,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4364,9 +4268,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4476,9 +4377,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4691,7 +4589,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4833,7 +4730,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4975,7 +4871,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5117,7 +5012,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5265,7 +5159,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5439,7 +5332,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5609,7 +5501,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5757,7 +5648,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5899,7 +5789,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6041,7 +5930,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6213,7 +6101,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6365,7 +6252,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6507,7 +6393,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6649,7 +6534,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6791,7 +6675,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6951,7 +6834,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7099,7 +6981,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_msvc_rel.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_msvc_rel.json
index 417e0b8..79148af 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_msvc_rel.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x64_msvc_rel.json
@@ -692,9 +692,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -804,9 +801,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -916,9 +910,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1028,9 +1019,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1144,9 +1132,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1260,9 +1245,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1376,9 +1358,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1492,9 +1471,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1608,9 +1584,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1724,9 +1697,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1840,9 +1810,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1956,9 +1923,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2072,9 +2036,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2188,9 +2149,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2304,9 +2262,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2420,9 +2375,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2532,9 +2484,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2644,9 +2593,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2756,9 +2702,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2872,9 +2815,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2988,9 +2928,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3104,9 +3041,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3220,9 +3154,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3336,9 +3267,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3452,9 +3380,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3564,9 +3489,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3676,9 +3598,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3788,9 +3707,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3900,9 +3816,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4016,9 +3929,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4132,9 +4042,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4248,9 +4155,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4364,9 +4268,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4476,9 +4377,6 @@
       "cpu",
       "x86-64",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4691,7 +4589,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4833,7 +4730,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4975,7 +4871,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5117,7 +5012,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5265,7 +5159,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5439,7 +5332,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5609,7 +5501,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5757,7 +5648,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5899,7 +5789,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6041,7 +5930,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6213,7 +6101,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6365,7 +6252,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6507,7 +6393,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6649,7 +6534,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6791,7 +6675,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6951,7 +6834,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7099,7 +6981,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86-64\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_clang_dbg.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_clang_dbg.json
index 14f88cd..56dc25b 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_clang_dbg.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_clang_dbg.json
@@ -719,9 +719,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -831,9 +828,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -943,9 +937,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1055,9 +1046,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1171,9 +1159,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1287,9 +1272,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1403,9 +1385,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1519,9 +1498,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1635,9 +1611,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1751,9 +1724,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1867,9 +1837,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1983,9 +1950,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2099,9 +2063,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2215,9 +2176,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2331,9 +2289,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2447,9 +2402,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2559,9 +2511,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2671,9 +2620,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2783,9 +2729,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2899,9 +2842,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3015,9 +2955,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3131,9 +3068,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3247,9 +3181,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3363,9 +3294,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3479,9 +3407,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3591,9 +3516,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3703,9 +3625,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3815,9 +3734,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3927,9 +3843,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4043,9 +3956,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4159,9 +4069,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4275,9 +4182,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4391,9 +4295,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4503,9 +4404,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4718,7 +4616,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4860,7 +4757,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5002,7 +4898,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5144,7 +5039,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5292,7 +5186,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5466,7 +5359,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5636,7 +5528,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5784,7 +5675,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5926,7 +5816,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6068,7 +5957,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6240,7 +6128,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6392,7 +6279,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6534,7 +6420,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6676,7 +6561,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6818,7 +6702,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6978,7 +6861,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7126,7 +7008,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_clang_rel.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_clang_rel.json
index 6879978..1bd3440 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_clang_rel.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_clang_rel.json
@@ -729,9 +729,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -841,9 +838,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -953,9 +947,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1065,9 +1056,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1181,9 +1169,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1297,9 +1282,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1413,9 +1395,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1529,9 +1508,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1645,9 +1621,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1761,9 +1734,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1877,9 +1847,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1993,9 +1960,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2109,9 +2073,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2225,9 +2186,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2341,9 +2299,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2457,9 +2412,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2569,9 +2521,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2681,9 +2630,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2793,9 +2739,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2909,9 +2852,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3025,9 +2965,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3141,9 +3078,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3257,9 +3191,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3373,9 +3304,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3489,9 +3417,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3601,9 +3526,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3713,9 +3635,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3825,9 +3744,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3937,9 +3853,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4053,9 +3966,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4169,9 +4079,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4285,9 +4192,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4401,9 +4305,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4513,9 +4414,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4948,7 +4846,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5090,7 +4987,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5232,7 +5128,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5374,7 +5269,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5522,7 +5416,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5696,7 +5589,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5866,7 +5758,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6014,7 +5905,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6156,7 +6046,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6298,7 +6187,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6470,7 +6358,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6622,7 +6509,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6764,7 +6650,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6906,7 +6791,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7048,7 +6932,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7208,7 +7091,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7356,7 +7238,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_msvc_dbg.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_msvc_dbg.json
index e850d67..06a6407 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_msvc_dbg.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_msvc_dbg.json
@@ -692,9 +692,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -804,9 +801,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -916,9 +910,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1028,9 +1019,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1144,9 +1132,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1260,9 +1245,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1376,9 +1358,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1492,9 +1471,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1608,9 +1584,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1724,9 +1697,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1840,9 +1810,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1956,9 +1923,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2072,9 +2036,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2188,9 +2149,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2304,9 +2262,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2420,9 +2375,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2532,9 +2484,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2644,9 +2593,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2756,9 +2702,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2872,9 +2815,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2988,9 +2928,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3104,9 +3041,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3220,9 +3154,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3336,9 +3267,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3452,9 +3380,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3564,9 +3489,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3676,9 +3598,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3788,9 +3707,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3900,9 +3816,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4016,9 +3929,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4132,9 +4042,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4248,9 +4155,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4364,9 +4268,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4476,9 +4377,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4691,7 +4589,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4833,7 +4730,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4975,7 +4871,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5117,7 +5012,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5265,7 +5159,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5439,7 +5332,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5609,7 +5501,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5757,7 +5648,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5899,7 +5789,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6041,7 +5930,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6213,7 +6101,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6365,7 +6252,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6507,7 +6393,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6649,7 +6534,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6791,7 +6675,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6951,7 +6834,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7099,7 +6981,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
diff --git a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_msvc_rel.json b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_msvc_rel.json
index 23c5f14..a5ede2c 100644
--- a/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_msvc_rel.json
+++ b/scripts/slave/recipes/webrtc/standalone.expected/luci_webrtc_try_win_x86_msvc_rel.json
@@ -697,9 +697,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -809,9 +806,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -921,9 +915,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1033,9 +1024,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1149,9 +1137,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1265,9 +1250,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1381,9 +1363,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1497,9 +1476,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1613,9 +1589,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1729,9 +1702,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1845,9 +1815,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -1961,9 +1928,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2077,9 +2041,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2193,9 +2154,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2309,9 +2267,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2425,9 +2380,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2537,9 +2489,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2649,9 +2598,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2761,9 +2707,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2877,9 +2820,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -2993,9 +2933,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3109,9 +3046,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3225,9 +3159,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3341,9 +3272,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3457,9 +3385,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3569,9 +3494,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3681,9 +3603,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3793,9 +3712,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -3905,9 +3821,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4021,9 +3934,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4137,9 +4047,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4253,9 +4160,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4369,9 +4273,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4481,9 +4382,6 @@
       "cpu",
       "x86",
       "--dimension",
-      "gpu",
-      "none",
-      "--dimension",
       "os",
       "Windows-7-SP1",
       "--dimension",
@@ -4805,7 +4703,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"audio_decoder_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -4947,7 +4844,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_audio_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5089,7 +4985,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"common_video_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5231,7 +5126,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"low_bandwidth_audio_test\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5379,7 +5273,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5553,7 +5446,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"modules_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5723,7 +5615,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"peerconnection_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -5871,7 +5762,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_media_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6013,7 +5903,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_pc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6155,7 +6044,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_stats_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6327,7 +6215,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"rtc_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6479,7 +6366,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"slow_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6621,7 +6507,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"system_wrappers_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6763,7 +6648,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"test_support_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -6905,7 +6789,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"tools_unittests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7065,7 +6948,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"video_engine_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",
@@ -7213,7 +7095,6 @@
       "@@@STEP_LOG_LINE@step_metadata@  \"canonical_step_name\": \"webrtc_nonparallel_tests\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@  \"dimensions\": {@@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"cpu\": \"x86\", @@@",
-      "@@@STEP_LOG_LINE@step_metadata@    \"gpu\": \"none\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"os\": \"Windows-7-SP1\", @@@",
       "@@@STEP_LOG_LINE@step_metadata@    \"pool\": \"Chrome\"@@@",
       "@@@STEP_LOG_LINE@step_metadata@  }, @@@",