Merge "Refactorings to match adb_abb to adb_shell code."