MMS: used my own branch

Change-Id: I0ccf4f435d7b181b74742274180cdfd75ba812f4