Merge "Use IntDef for BCD_EXTENDED_TYPE"