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