Merge "fix wrong trace from IpConnectivityMetrics"