Merge change 3008 into donut

* changes:
  adb: Workaround for adb disconnect problem.