Merge "Add the carrier config for cdma less carrier"