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

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