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

* commit '8e6435ead5b118f1fd458d4acbdd0bf86754ab1b':
  Add defines for CAIF support