Merge "Revert "Create builder class for TunnelMetricsInterface""