Updated auto-discovery process with new api

Change-Id: I242779c31885725476db39c51b89db719b6bb51d
Merge "Updated auto-discovery process with new api"