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