Merge "Update java.time.Duration partially to 11+28"