OmniSwitch: service life-cycle tweaks

Service must no be killed

Change-Id: Ib4cfccc8579e1cb016c6fcbecc2a7552ef199615