Merge "Drop the "Config". Just "CarrierService". It's cleaner." into mnc-dev