am f2ecb683: am 38796fe1: Merge "Fix sync problems when setting up a new user and account" into jb-mr1-dev

* commit 'f2ecb683529a9101c31b489e780a73b8744d19a3':
  Fix sync problems when setting up a new user and account