Merge change 21634 into eclair

* changes:
  Add new calendar database columns; do not merge (cherry-picked 1fa64)