Merge "Remove apn carrier="Swisscom MMS" carrier_id 2366" into main