Merge "Add null check for carrierConfig"