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

Change-Id: I2745911481dde3317b85e31ec6e2f2758e9b0740