Add Caf stuff

Change-Id: Ie368b896ce2acbc4183b7fb55ead8e26a0a7639b