[PEP8] changes, remove obsolete imports

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