Merge "adb: Fix return value in error case" am: 2925a580e9
am: 73308830a6

Change-Id: I7cf13d7e4f5850b99fdd843fbd09e349cfea8bee