Merge "Remove RcsProvider"