Minor PEP8 fixes

Change-Id: I3a87713696b3c9c8415ffcf76b23fb40c39df2c6
Merge "Minor PEP8 fixes"