Merge "Add EasCalendarSync" into ub-mail-klp-mr2