Merge "Add the option to match a whitelist of strings in FieldValueMatcher."