am 76b8fce5: am 5203340c: am 9504c6b5: Renaming carrier config variable keys.

* commit '76b8fce588845e348161ec526655ee5f80e5f571':
  Renaming carrier config variable keys.