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

Change-Id: I2317b344a224e15853d0a91c8437f0d452728dfe