adds checking of garbage devices if they are left from deleted service
port

Change-Id: Ia9c915b4ae15a35a0dfca6dd52f596d0581e411e