Merge "Change rcs carrier config"