Merge change 8886

* changes:
  Fix broken calendar tests.