Merge "Fix a flake where network caps change innocuously."