Merge "Close open sockets when enabling firewall rules." into nyc-dev am: b414eb8
am: f35865b

* commit 'f35865b71a1030d8b68b720ff073a4a3f4945155':
  Close open sockets when enabling firewall rules.

Change-Id: I3a1a13f20322d0e93f3cc083c2abb63d05fd68f5