Merge "metrics: Fix import paths for headers."