Merge "Switch over to use EasService" into ub-mail-master