Merge "Use IntDef for BCD_EXTENDED_TYPE"
am: 97246476a7

Change-Id: I20ac464b285c1eb2572fc8a280ee2ff4b4c1b1c3