am 6c92369c: Merge "logcat: improve error messages"

* commit '6c92369cbea460fded7e85f9751c6938000f504a':
  logcat: improve error messages