Mms: Partially revert 8fc72f871.

  - CAF implementation duplicates cm feature, in a non-intuitive way.

Change-Id: I78041559006c23b2950e94d65676e3741e18e916