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

Change-Id: Ic99c52fd89979266748417f6dcdd045364668c3c