[PEP8] changes

Change-Id: If0e342a303f7bffe400c9e29f2617cd8c564a707
Merge "[PEP8] changes"