Pylint fixes.
Merge pull request #10650 from cro/pylint_fixes_0221

Pylint fixes.