Mms: Cleanup CAF additions

Change-Id: I441560973c3a36918702080d379b993a9cc063ef
Merge "Mms: Cleanup CAF additions" into cm-11.0
Merge branch 'cm-11.0' into kk_mkt