Merge "Use resource instead of carrier config"