MMS: used my own branch

Change-Id: I21dd777ea013e176240f9352be3fdd690408a0a3