Merge "Move CalendarSyncParser into its own file" into jb-ub-mail-ur10