Use caf-new

Change-Id: I30e53f7bbdcc7c88ba5718b06b5a6fd8f60e8eb9