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

Change-Id: I5ddcab70828fec9f59de920feb085c867bd0059e