Merge change I0151a6db into eclair-mr2

* changes:
  Add CalendarProvider unittests.