Resolved flake8 issues #2346

Review ID: 392001