Modification on services even when not connected

Change-Id: I6d5393624d53dfece4d2c9e5082ee1063cf374d4