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

* commit '4ef1f6a689e12f265d12638329a35c9ae927b3b8':
  Synchronize all access to the EmailServiceInfo map.