fix flake8 issues

Change-Id: I3912c9af919cc4c62a70b9c62327ac06399d8d81