This change adds CFR supports for KIWI. Change-Id: I895eeae41c7f8bba4a35ee46a2ad6a1eadf82f9b CRs-Fixed: 3114230