Replace "e-mail" by "email"

For consistency

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