Revert "Squashed adb fixes."

This reverts commit 2d6453320ebecc551008e52830e8f11ab607d1c2.