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

Change-Id: I58530b41d221914d6f9cb5cf39b3615da261da8b