Merge "Discover primary service by UUID for PTS tests (3/4)"