Merge pull request #16605 from adityahase/fix-py3

fix(py3): Python 3 compatibility fixes