Merge "Remove RcsProvider"
am: 869c401773

Change-Id: Ica14a65d8bf8e33b2d63d0db0c609b146495c811