Replace "e-mail" by "email"

For consistency

Change-Id: Idc84a01db459462be4aa0a325b78eb3982e7037b
Merge "Replace "e-mail" by "email""