Merge "Encode special characters in email addresses." am: c4a7ed3530 am: 1124a1bd01 am: f754ef73a5
am: badde95384

Change-Id: Ib5d2da119c87b532b47a7f858711328925b5acc0