Merge change 3951 into donut

* changes:
  Revert "adb: Workaround for adb disconnect problem."