py3 cleanups

Change-Id: I3d7dad6bfb4b0394a7c0d5942310b01b741077c2
Merge "py3 cleanups"