Merge "Move print statments over to py3 style."
am: fa8dc66978

Change-Id: I27a51f99a22f4d993dcafd7c43c9a6568729be81