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

Change-Id: Ie4ea4e49688a7d0c6d593e8bc3f1930d6a16e6b1