Merge "Fix MulticastSocket example code"