Cleaning up lint
Removing unused import
Use shlex_quote from six
Merge pull request #18265 from nmadhok/clean-lint

Cleaning up lint