Merge "Clean up key handling in adb."