Move CAF strings

Change-Id: I5d8bbf7075d1d24391bbbf0d190a33cc097c40a6
Merge branch 'cm' into HEAD