Merge "Encode special characters in email addresses."
am: c4a7ed3530

Change-Id: I5b22ee5588388433c82333993bd2ebb25dbd9d52