[PEP8] changes

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