[SYNC] Synchronize with core, pep8 changes

Change-Id: I3979565b6cbcde1c5be9264f373129a65b05dea1
Merge "[SYNC] Synchronize with core, pep8 changes"