Merge branch 'hotfix/3.0.5.1'
Fixed flake8 issues #4204.

Review Id : 3023001
Release version 3.0.5.2
Merge branch 'hotfix/3.0.5.2' into develop