Merge "Refactor the InetSocketAddress in MulticastPacketReader to use port zero"