Fix upsync for calendars.

Change-Id: If3d48a942c145b6e3e2c08c17264a54b1805de16
8 files changed