merging 792 and send email related changes

Change-Id: I347dbae131bb0890513110f3edf10c04986b2dbf
Signed-off-by: madavi <jm00553988@techmahindra.com>
3 files changed