Merge "Test nuking IPv4 sockets as well as IPv6." am: f6dc5650be
am: 1634a952c6

* commit '1634a952c67e75141f07285a7ccb8a2007f5113c':
  Test nuking IPv4 sockets as well as IPv6.