Fixes linter errors found in PR #17147.