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

* commit 'bb640d5ff4c6cb924cc1b7354c396d6c4a3b679a':