Merge "logcat: more error printing clean-up"