Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev