am 7b98bfcc: Merge "More adb cleanup."

* commit '7b98bfcc9fa8678d32a729a41036dea864f262ab':
  More adb cleanup.