am 5dadac50: am 87af04a4: Merge "Improve some adb error logging"

* commit '5dadac50c4bbeaf8baf4d5e04c2d2706d9e74fc7':
  Improve some adb error logging