Merge "logcat: fix error propagation." am: 2d1d8812cc am: 94984cf4bd
am: 8c05cd743e

Change-Id: I7d5e1a44c479f01f249398e1b44644edc4d64080