restart services correctly

Change-Id: Ia2a611e40bd3078901bd3831bd40eae1cecb200c