Fix pyflakes problems

Change-Id: I5586241e9274c143156fdb0c64bf5a92e25237fa