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

Change-Id: If03e5e2b9498fe889eb8797766105f57a19932f0