Resolved flake8 issues #2202

Review ID: 373003