Merge "Restore default port for `adb connect`."
am: abd4cab8c6

Change-Id: I6e5edbe8389473c775d986e37d4774e1a8517751