Merge "Remove incorrect carrier config values"