(no-ticket) pep8 fixes

Change-Id: I7295269c72cea6e0c0d08e223aea3c560f8b08b9