am 9504c6b5: Renaming carrier config variable keys.

* commit '9504c6b5c5c7072f72d8a9e6df59dbda8a6ccbe4':
  Renaming carrier config variable keys.