am e05762a5: am 8e6435ea: Merge "Add defines for CAIF support"

* commit 'e05762a5312261b96d20597eb6c3a61abaeac2cf':
  Add defines for CAIF support