Merge "Use carrier key from carrier config"