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

Change-Id: Iff87d6efa0bb55c84e852a84489a0218acd21100