Fixed flake8 issues #4202

Review ID: 2953001