Merge "Refactorings to match adb_abb to adb_shell code." am: 463773b733
am: 339fcd996a

Change-Id: I99004bc6e11f1a13d6908050e5a99370a2bd4bde