Merge "Fix DEX type name for `long`"
am: 5051c31aae

Change-Id: I2be0e04bbd6bcf73bb39ba78968b1bb40bb59fa8