am 48ae7ee3: am 459b2ba5: Merge "Fix various bugs in DatePickerCalendarDelegate" into lmp-dev

* commit '48ae7ee3f980c811bf0ff8fc9e9797133d9bc3a5':
  Fix various bugs in DatePickerCalendarDelegate