am fdc64a19: am 29b5eb9f: Remove default calendar code.

Merge commit 'fdc64a195af7d3924942913362796ae2a43df4b8'

* commit 'fdc64a195af7d3924942913362796ae2a43df4b8':
  Remove default calendar code.