Merge "Update java.util.Set partially to 11+28"