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