Merge "Synchronize all access to the EmailServiceInfo map." into jb-ub-mail-ur10