Merge "Extract UpstreamNetworkMonitor to its own file"