Fix new presubmit failures due to tooling updates