use service_id as key in warden service

Change-Id: I8297ed99cd55a2730c37cc590f12fc98f6b4f469