fix style issues with new flake8

Change-Id: If3343bedf3bf01f383c9f837d3606fcd14949f23