Fix new presubmit errors.