Unsetting the email address for a user when the email address is invalidated.

Change-Id: I2a8445745f04540e7962695c3116bb247d81fd94
Merge "Unsetting the email address for a user when the email address is invalidated."