Merge "Fix overflow in adb_client"