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

Change-Id: I41acf3640305f597dd7b54f2ed0900e57b5070da