Merge "More adb buffer fixes."