Review 15013

Lester Cheung
Import fixes for Python3.
#1: Change 15011 committed into //guest/lester_cheung/p4review 1 0 0
Tip: Use n and p to cycle through the changes.