[PEP8] remaining pep8 changes

Change-Id: I915cba5f57ee3f8e9901ccee039ca2fda932373e