Fix flake8 errors

Change-Id: Ieb7144461d8256eddb972796ccb4dcd13d157d76