Merge "Revert "Refactor CallFilteringResult to use a builder""