[PEP8] changes

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