Merge "Mms: Cleanup CAF additions" into cm-11.0