Merge "metrics_collector: Fix build of tests"