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

* commit '406abdc8a2b68df77ab30836826f642c2ef37bda':
  Improve some adb error logging