Fixed Flake8 issues #4204

Review Id: 2943001