Merge change 26993 into eclair

* changes:
  Pass provider authority to SyncActivityTooManyDeletes