Merge "Fix raw reference to Predicate"