am 90c987ae: am 205fe71b: Extend and fix CalendarProvider2 unittests.

Merge commit '90c987aeaf57635d510eba92000d725ea5405df5'

* commit '90c987aeaf57635d510eba92000d725ea5405df5':
  Extend and fix CalendarProvider2 unittests.