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

Change-Id: I3a35c3ba49d509d849bd4dcf2ed7a56d2c796991