Merge change 6680

* changes:
  remove the accounts table from the ContactsProvider2