Merge "Update EmailService implementation to include sendMail"