MMS: Softbank smiley + transition to new cm_ format

Patch 2: Added a merge from today - and removed comments as suggested

Change-Id: I927a2abcf0ae56125c4b318d93a0db4fcb9936e5
Merge "MMS: Softbank smiley + transition to new cm_ format" into cm-10.1