Merge "adb: improve network error info"