[PEP8] changes, synchronized with core

Change-Id: I3cf76872bf221aa10695b78e763fc040901f0d9f