Attempting to upload a change to src/content/test/gpu/webgl2_conformance_expectations.py fails with the following:

kbr-macbookpro4:src kbr$ git cl upload
Using 50% similarity for rename/copy detection. Override with --similarity.
Running presubmit upload checks ...

** Presubmit Warnings **
('run_content_test_gpu_unittests',) (0.72s) failed
Failed to import test module: gpu_tests.memory_test
Traceback (most recent call last):
  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/unittest/loader.py", line 254, in _find_tests
    module = self._get_module_from_name(name)
  File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/unittest/loader.py", line 232, in _get_module_from_name
    __import__(name)
  File "/Users/kbr/src/chrome/src/content/test/gpu/gpu_tests/memory_test.py", line 4, in <module>
    from gpu_tests import gpu_test_base
  File "/Users/kbr/src/chrome/src/content/test/gpu/gpu_tests/gpu_test_base.py", line 7, in <module>
    from telemetry import benchmark as benchmark_module
  File "/Users/kbr/src/chrome/src/third_party/catapult/telemetry/telemetry/benchmark.py", line 8, in <module>
    from telemetry.internal import story_runner
  File "/Users/kbr/src/chrome/src/third_party/catapult/telemetry/telemetry/internal/story_runner.py", line 18, in <module>
    from telemetry import page
  File "/Users/kbr/src/chrome/src/third_party/catapult/telemetry/telemetry/page/__init__.py", line 12, in <module>
    from telemetry.page import shared_page_state
  File "/Users/kbr/src/chrome/src/third_party/catapult/telemetry/telemetry/page/shared_page_state.py", line 27, in <module>
    from telemetry.web_perf import timeline_based_measurement
  File "/Users/kbr/src/chrome/src/third_party/catapult/telemetry/telemetry/web_perf/timeline_based_measurement.py", line 8, in <module>
    from tracing.metrics import metric_runner
ImportError: No module named metrics

Telemetry folks, could you please help? Can we further add some checks so Catapult rolls don't break our unit tests? Thanks.