Merge "Fix error printing code." am: b0c5cd27a1 am: d460e78d87
am: 2bf21dad2f

Change-Id: I230b27e24f5c5efb0cf6eb5004a4a02b9cf87517