Fixed flake8 issues #4204.

Review Id : 3023001