Merge "Update java.util.List to 11+28"