Merge "Implement serviceType handling for E2E network slicing"