am 64128563: Merge "Renaming carrier config variable keys." into mnc-dev

* commit '6412856358493455692955147991d858cfe16f80':
  Renaming carrier config variable keys.