Merge "Add ability for CTS to set itself as carrier service package" into main