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

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