pep8 changes

Change-Id: I2256d577b16224ed490a3bca631cf5e8ff1f9cf3
Merge "pep8 changes"