NXP-10842: format/cleanup
NXP-10842: use time zone set on the calendar instance