pep8 changes, synchronize with core

Change-Id: I274201bd4247ec56f6573cf3bc40d29ef72ac6e7