Bug 58053 - py3k: Fix various imports

Change-Id: I0e56a114bf387200442d97e0091a52b51e9e0ac1
Merge "Bug 58053 - py3k: Fix various imports"