[PEP8] changes

Change-Id: I7e5b91177806e19100e8e140f4e8674397b9a522
Merge "[PEP8] changes"