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

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