Resolved flake8 issues #2343

Review ID: 389001