Merge "AWARE: Abstract structure of match filters" am: f358a69cba
am: 7f12aa5470

Change-Id: I6d70ec6234752e2d84ad72dcbcbb15dfad6ad5d1