am c35575f7: am a2f93c75: Fix remaining print test failures.

* commit 'c35575f79aece12a03ed5927ee87c0928a45dba8':