Move CAF strings

Change-Id: Iab6288057e987cac866f6716761254e0329dd660