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

Change-Id: I33c6b54d200e8fb50514a9f66b314ef13a7f9082