Merge "DatagramSocket should set IP_MULTICAST_ALL to 0" am: 3a9de46e7c
am: f4039009e0

Change-Id: I94fce674e661246d5e792d3d7bba3dff9e7a229f