Merge "ApfFilter: take into account IPv4 subnet prefix" into nyc-mr1-dev
am: 886a45acfe

Change-Id: I55ec11c16cd9a209d5b25669870feba6d2f53246