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

Change-Id: I2e8d88291ee2f26fda59607eb64e8d6accf69968