Merge change 805

* changes:
  decouple SyncAdapter from ContentProvider