Merge "Fix DatagramChannelTest failures"