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

Change-Id: Ic13bb12bc2bad19333c86ba2943ecbf7e2f270d6