[PEP8] changes

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