Format email addresses more consistently

Change-Id: I1dbced804ff1e0bf8e162570c17cc537d318872f
Merge "Format email addresses more consistently"