caf is back

Change-Id: I747cd84c6ea3f300eae5b5dc062b743506918c5a