Cleanup in EmailContent

Change-Id: Icb51cda53b2ad9b1aac15631cf86b5696f3b8e3c
8 files changed