Merge change 6679

* changes:
  remove the accounts table from the ContactsProvider2