am e80f40c5: am b53e4c4a: Merge "Revert "Fix various bugs in DatePickerCalendarDelegate"" into lmp-dev

* commit 'e80f40c5e86fff5ce075082b8ecbf23ea429f1dd':
  Revert "Fix various bugs in DatePickerCalendarDelegate"