Merge "Merging stat_notify in Email" into gingerbread