Merge "Remove RcsProvider" am: 869c401773 am: 797e61a6a5

Change-Id: I6e1bd4db902488caa62896ea076b6d29d36b1103