Merge "Simplify UpstreamNetworkMonitor callback handling"