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

* commit '0261ae4bb51483839e0c0ac8a3b54fd715a15275':
  metrics_collector: Fix build of tests