Merge "adb: partially revert b5e11415." am: ef9426d883
am: d3f7956f2f

Change-Id: I981f3acc2a2e27bbf34d838d60071bc8f66d4250