Merge "Better IPv4 multicast coverage in ApfTest" into nyc-mr1-dev am: 6708b64797
am: 116311c400

Change-Id: I3f5fdf7216771520935bb5059dc583e58a0890ed