Merge "Move some of emailcommon to UnifiedEmail." into jb-ub-mail-ur10