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

* commit 'b742495cf54c09c5780c7c22f4d389b92e22449d':
  ApfFilter unit test

Change-Id: Ib0595b9cd72efaa408028983287fea0b81b3bee6