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