Merge "ApfFilter unit test" into nyc-dev am: b742495cf5 am: c6154624f2
am: a2512d3485

* commit 'a2512d3485159f33737b0d6ffb07b1ff6126d749':
  ApfFilter unit test

Change-Id: Ide959b34cd6bd97620b2c14812bd362d203fd85f