Merge "Merge "Fix sync initialization on secondary users" am: 99f99a52e7 am: ad4c0c4add am: e66f28c6ee"