am d163332b: am d5fdf404: Merge "Fix STARTTLS handshake error in Email\'s SmtpSender class"

* commit 'd163332bc58cb1b2f09fd061e51e50ecbc40eb73':
  Fix STARTTLS handshake error in Email's SmtpSender class