fix flake8 issues

Change-Id: I28b77634131c4430cb8897736faecf0610019511