Support all valid (per RFC1035) email addresses

Change-Id: I3ca896c5aafdb893e4c6da0dd2be5fecf4f65d4e