Merge "Remove spurious long to int type casting in ApfFilter.java" into main