am dd74d6ed: (-s ours) am 042d992d: am b22644fa: am 2bb672a2: (-s ours) am 582bb0dc: am fbb1561a: am 44bcd64e: Fix CalendarView to show the right labels. [DO NOT MERGE]

* commit 'dd74d6ed61b945c51fed2efde4812e4fee6cfb76':
  Fix CalendarView to show the right labels. [DO NOT MERGE]