Fixes intermittent failures observed in some network tests Reviewed-by: chegar
Reviewed-by: darcy, ihse