Mms: Fix for Transifex

Change-Id: I2d8ae5965930d4a04ebba784ce1483028d5f947a
Merge remote-tracking branch 'cm/cm-11.0' into HEAD