Merge "adb: fix uninitialized variable." am: 588a87d68e
am: 966b39b34c

Change-Id: I86042d0866724c152da5f052772933417b654fb8