Fixing pylint violations
Merge pull request #13747 from nmadhok/fix-lint

Fixing pylint violations