Merge change 9686

* changes:
  Attendee database changes for calendar.