some pep8 changes

Change-Id: I4a33e5f47ee6999f32a5cda6780de6771f3f01bc
Merge "some pep8 changes"