Merge "Address API feedback for carrier selection API" into sc-dev