Merge "Close open sockets when enabling firewall rules." into nyc-dev