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

Change-Id: I8b53856b3b577370fadc175f7cb6ebc677e3ed4c