Merge "Fix DatagramMulticastChannelTest so it works better on hammerhead"