Merge "Merge "AWARE: Abstract structure of match filters" am: f358a69c am: 7f12aa54" into nyc-mr1-dev-plus-aosp