MMS: Latest Danish merges

Change-Id: I95860c154bd099c65263e0ec65c0a4bf5d2a1a72
Merge "MMS: Latest Danish merges" into cm-10.1