Merge "Prepare UpstreamNetworkMonitor for extraction"