Merge "Use IntDef for BCD_EXTENDED_TYPE" am: 97246476a7
am: a2311212a6

Change-Id: I228c3af0f864e97ab28806745466bc2d72e293b3