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

Change-Id: I3e792200935470b0c75e70b9d0aa339ce8eb967d