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

Change-Id: If063f4ff5cd49c93766d227d53b1ac18be4a6058