Merge "Break out ReviewerFilter filtering to util class"