Merge "adb: partially revert 3cf1b36e."