Resolved flake8 issues #2413

Task ID: project-7/task-2413
Review ID: 409001
Migrated to 2.8 #2413

Task ID: project-7/task-2413
Review ID: 409001