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

Change-Id: I079da0c338d18191182ad93d31c93d00ec11db64