am fb1ee08c: am a49c3585: Merge "Fix CalendarView to show the right month and year label." into jb-mr2-dev

* commit 'fb1ee08ca4424969c148760937d18ec0e3de206c':
  Fix CalendarView to show the right month and year label.