Resolved flake8 issues #2713

Review ID: 460001