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