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

Change-Id: I7ad873b7b124e13eade7ba56d2f042bb4a8309b5