Py3 adaptation

    Unrelated: RE-00

Change-Id: Id2f8f330003a7b53a7fbd11057113b0192376c74
9 files changed