fix imports in py3

Change-Id: I08ef8ec8fddf7f715a6f4b6aa8ee243cb9aad674
7 files changed