Fix pylint errors
Merge pull request #15531 from rallytime/pylint_fix

Fix pylint errors