Merge "adb: fix abb test." am: fc4e54ecb0 am: 6016dd02a4

Change-Id: I4a90821d987596381e0bb4a64c47eecce082b5e3