Merge "Clean up key handling in adb." am: b859830450 am: 81a3f71e45 am: f648fb4539
am: 98fb12188f

Change-Id: I8219df3f4ffb2e56eef3c419db4790af7a79974c