Flake8 compliance changes

Change-Id: I6a6a79a62d7862c55932c67121fb07d1a217275e