pep8 (part1)

Change-Id: Ib3890c8d1d692809dc9c39fd6c4ac7a6848a209e
Merge "pep8 (part1)"