Merge "Fix potential ApfFilter bugs by careful ByteBuffer use" into nyc-dev