Merge "Use batching to set firewall rules." into nyc-dev