Finish up flake8 conversion.

Change-Id: I5034f19d5f9b20ad2b4569455273c730b1efec08