| Index: infra_libs/ts_mon/common/standard_metrics.py | 
| diff --git a/infra_libs/ts_mon/standard_metrics.py b/infra_libs/ts_mon/common/standard_metrics.py | 
| similarity index 78% | 
| rename from infra_libs/ts_mon/standard_metrics.py | 
| rename to infra_libs/ts_mon/common/standard_metrics.py | 
| index 673e6cd38c550c3cf9da77f124ba8827718be1a8..601543550c6e092a82c4b986c4a536aa2b59c9c9 100644 | 
| --- a/infra_libs/ts_mon/standard_metrics.py | 
| +++ b/infra_libs/ts_mon/common/standard_metrics.py | 
| @@ -4,7 +4,10 @@ | 
|  | 
| """Metrics common to all tasks and devices.""" | 
|  | 
| -from infra_libs.ts_mon import metrics | 
| +try: | 
| +  from infra_libs.ts_mon.common import metrics | 
| +except ImportError: | 
| +  from common import metrics | 
|  | 
| # TODO(dsansome): Add more metrics for git revision, cipd package version, | 
| # uptime, etc. | 
|  |