Merge "Add null check for CarrierConfig"