am 8a98f580: (-s ours) Fix broken calendar tests. DO NOT MERGE

Merge commit '8a98f5803994ca1538d53973ebc72e1c5dfdba5a'

* commit '8a98f5803994ca1538d53973ebc72e1c5dfdba5a':
  Fix broken calendar tests. DO NOT MERGE