Merge "Fix API review issues for 5G Slicing feature" into sc-dev