am b74d8892: Merge "More adb buffer fixes."

* commit 'b74d889211f30d99c222fa7d3cfaf4a7390d6a95':
  More adb buffer fixes.