am 2ca6382f: am 92af733e: More adb buffer fixes.

* commit '2ca6382f1e7384998c5e9aa33311f58f01d9348a':
  More adb buffer fixes.