Merge "Move values over from mailcommon to unifiedemail." into jb-ub-mail