am a2f93c75: Fix remaining print test failures.

* commit 'a2f93c757eba9ceb1035b2498fb0df21e7184136':
  Fix remaining print test failures.