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

Change-Id: I53d2b6e2b660b364f1eedd8510700eaacfd5d346