Merge "Remove IPSet compat classes"