Merge "Python 3 compatibility."
am: 6f08ea2f38

Change-Id: I21686b14f2f19436cdd177644d07c4b740fe13bd