[PEP8] changes, remove obsolete imports

Change-Id: Iea4c84c9eebe99ba5d0d722d9e12601bcfb7ff56
Merge "[PEP8] changes, remove obsolete imports"