am fa311c3c: adb: Another attempted workaround for the adb disconnect problem.

Merge commit 'fa311c3c3c43dd228524a98b55d320d43db51c32'

* commit 'fa311c3c3c43dd228524a98b55d320d43db51c32':
  adb: Another attempted workaround for the adb disconnect problem.