Fixed flake8 issues #4203

Review ID: 3123001