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