am 6bd0513a: Merge "Drop the "Config". Just "CarrierService". It\'s cleaner." into mnc-dev

* commit '6bd0513a2129e0c2a3fd07eecff05fc7f46ac714':
  Drop the "Config". Just "CarrierService". It's cleaner.