am b30531fc: am 2b581345: am b74d8892: Merge "More adb buffer fixes."

* commit 'b30531fc8b002b8167492ae6611b7931427b9329':
  More adb buffer fixes.