Merge "Python 3 compatibility." am: 6f08ea2f38 am: cd4553db30
am: 66db6affd8

Change-Id: I877e7eb2f36ec2d7a4204193b463520e24edeb15