Merge "Try to fix HostsideRestrictBackgroundNetworkTests flakyness again." into oc-dev