Merge "APIs for 5G slicing" into sc-dev