Merge "Refactor ApfFilter creation"
am: 5e619dce66

Change-Id: I0be4951cf3feafc94564fad436dec3e8bfceddc4