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

* commit 'f8c9ccf3bd73937be740a8ce63e7ee9a62b7c6ec':
  logcat: improve error messages