Merge "Fix error case to print newlines properly." am: b08fde95cb am: 452d4d3db5
am: aa04c39081

Change-Id: I423f84ea896742fc8bd6a4e1cbeaa2fd133211db