Merge "make UpsreamNetworkMonitor the sole source of upstream network information" into oc-dr1-dev