Merge "Expand NetworkMonitor metrics" into nyc-dev