Fixed minor pep8 warnings

Change-Id: I4630afca2ccd52dff13a5d72740fb17d7e28024f
Merge "Fixed minor pep8 warnings"