Mms - Fix type (FR)

Change-Id: I679a624334be692f6b6427f20474d8d425866623
merge changes from remotes/github/cm-10.1 into master