diff -r 86cf7a1b7eb9 -r 48a00b70dc49 sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss
--- a/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss	Fri Jul 16 11:04:43 2010 +0300
+++ b/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss	Fri Jul 30 10:34:49 2010 +0300
@@ -114,6 +114,10 @@
        //prio 0x7EE1
        r_cmd_nmailagent 	//MBEN-83CFQE
 #endif //FF_EMAIL_FRAMEWORK
+			//prio 0x7EE0
+			 ,r_cmd_activitymonmediamgr,	//FMAO-867HYW
+			 //prio 0x7EDF
+			 r_cmd_mediamgr			//FMAO-867HYW
     	 };
     }
 
@@ -293,6 +297,20 @@
     }
 #endif //FF_EMAIL_FRAMEWORK
 
+// ---------------------------------------------------------------------------
+// r_cmd_activitymonmediamgr
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonmediamgr
+    {
+    priority = 0x7EE0;
+    severity = ECmdCriticalSeverity;
+    execution_behaviour = ESsmWaitForSignal;
+    dllname = "ssmactivitycmd.dll";
+    ordinal = 1; // SsmActivityCmdNewL
+    retries = 2;
+    dll_data = r_dlldata_activitymonitor_timeout;
+    }
 
 // ---------------------------------------------------------------------------
 // r_cmd_autosync
@@ -329,6 +347,17 @@
     monitor_info = r_mon_3_restarts_ignore;
     }
 
+// ---------------------------------------------------------------------------
+// r_cmd_mediamgr
+// ---------------------------------------------------------------------------
+//
+RESOURCE SSM_START_APP_INFO r_cmd_mediamgr
+    {
+    priority = 0x7EDF;
+    name = "z:\\sys\\bin\\MediaManager.exe";
+    execution_behaviour = ESsmFireAndForget;
+    background = 1; // To background
+    }
 
 // ---------------------------------------------------------------------------
 // r_cmd_msgnotifier