Merge "Restore default port for `adb connect`." am: 690c8c8f25
am: 45e2255f65

Change-Id: I5d900637850a0333aaa22d5345c64393ea55ce00