Merge "metrics_collector: Fix build of tests"
am: 89faffc066

* commit '89faffc066ec77f06ce1e8772160ce5ccd4aff68':
  metrics_collector: Fix build of tests