Merge "logcat: improve error messages"