Merge "Do not export RcsProvider"