Mms: merge CyanogenMod

Change-Id: I5b187d3f240fcbd07e52cd45037efe96a4a3e200