Fix flake8 errors

Change-Id: I9cd62827c8b50cda6634012fbd15641491f54871