Fix flake8 errors

review8801002