Merge "Add defines for CAIF support"