Mms: Cleanup CAF additions

Change-Id: I441560973c3a36918702080d379b993a9cc063ef
Merge "Mms: Cleanup CAF additions" into cm-11.0
Mms: ES translations

- CAF translations

Change-Id: Ib244a2458c24327826c02d89dc4844e93094e5dd
Merge branch 'upstream/cm-11.0'