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

* commit '1eb46fd4f9f65e44495834b0608c6d82305d45bc':
  Renaming carrier config variable keys.