PEP8 fixes.

Change-Id: I1cbd0be97abac4cb5965fff6e3fa9a8eebcc3d89
More PEP8 fixes.

Change-Id: I1d51f74f58586d73f5ff5c8504f51e8f7d67b984