am f36aa8ec: (-s ours) am 5563b77a: am 57532b2a: Merge "adb: improve network error info"

* commit 'f36aa8ec5de6a254d2b2e3849d2d4d203a09ee9f':