Merge change 4137

* changes:
  Move meta feed handling to CalendarSyncAdapter