Resolved flake8 issues #2381

Task ID: project-989/task-2381
Review ID: 401001
Migrated to 2.8 #2381

Task ID: project-989/task-2381
Review ID: 401001