Fix flake8 warnings

Change-Id: Ib0e06199a9964562815a451114c1c3fa3bc359f2