Merge "Fix NPE in NetworkMetrics"