Merge "AWARE: Abstract structure of match filters" am: f358a69cba am: 7f12aa5470 am: 61eb0bf8fc
am: 257ed21d93

Change-Id: I59d444dc877f07b3a9c9e5f3286c708cd0d6c0e9