Merge "adb: partially revert b5e11415."