Merge "Change IEmailService.sync to have two different forms" into ub-mail-master