Merge "Revert "Use resource instead of carrier config""