Merge "logcat: more error printing clean-up"
am: 238eae1738

Change-Id: I1f4da8d1cb4c9ec9fd86aa487ac5d8a8bf27aa07