Merge "More adb cleanup."