ASACORE-1284 Fix discovery for certain scenarios.

Change-Id: Ia187e765b3b96d325513fc15dd1c8f059546a8d6
Signed-off-by: M. Sanu <msanu@qce.qualcomm.com>
Merge "ASACORE-1284 Fix discovery for certain scenarios." into RB14.12