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

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

Change-Id: I915ce66c1d3c1a65e005324fedb7f76557e3b006