Switch to Caf

Change-Id: I718cd8fa9ec63fd3b456f6a9812c8b721514e499