Merge "Refactor ApfFilter creation" am: 5e619dce66
am: 6c25e1e24d

Change-Id: I3f406b08287092d4e2bc23f158693cea6f6646e4