am c2394f9e: (-s ours) am b51fc0b2: Merge "adb tab completion: remove extraneous state"

* commit 'c2394f9e8e5c8e55f5d171f35709f30c30aa005c':