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