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

Change-Id: I56025dd51b3926906dbc76f8681d3dbf2152e18a