Fix pylint errors
Merge pull request #18684 from rallytime/pylint_fixes

Fix pylint errors