am 796bb8f0: am 8ba51ba3: am 4ca72a20: am 5e0a5cac: Merge "Speculative fix: ensure avatars are not created with empty email addresses" into ub-gmail-ur14-dev

* commit '796bb8f05c242a002b3f995287ca807bb50229c9':
  Speculative fix: ensure avatars are not created with empty email addresses