Merge "Revert "Complete FilterConfiguration getters and builders""