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

Change-Id: Ie88888af68882a485c813dcdf1136da9e4b871d3