Merge "Do not export RcsProvider" am: c92dc3df15
am: 646b20de19

Change-Id: I86d42e83ad2e723ac4a79982888ea0c9dda4b736