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

* commit '5203340cc49bc7198b88116578ee31e3cea7fcd8':
  Renaming carrier config variable keys.