Better IPv4 multicast coverage in ApfTest am: 961ca49fd6
am: 70611640e6

Change-Id: I1d1f8a68a1bdbf17758d6a06306cb07d8d34deef