Safer comparison for emails

Change-Id: Iea1c546e180b1bbdb4ad7fc4e269d85f223b0f27
Merge "Safer comparison for emails"