MSIM: Fix fragment class names

Change-Id: Ie85f68b6f8a1bb852578872a824fdff6f1474d60
Merge "MSIM: Fix fragment class names" into cm-11.0
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0