Replace "e-mail" by "email"

For consistency

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