am 580c3dfa: am 9edabb6c: am c35575f7: am a2f93c75: Fix remaining print test failures.

* commit '580c3dfa3ea4ae904db496d59e2a61cd1f8c8fbb':