don't proceed to test directory for discovery/client

Change-Id: I1bf9ad75a0c4470e600839be0a8b9d772c332cb1
Merge "don't proceed to test directory for discovery/client" into R1.06