Merge email source into email2

Change-Id: I68d5290663386b00b02c7b7488ee4f5177aa504d
546 files changed