Merge "Start of UpstreamNetworkMonitor unittests"