Merge "Upgrade of Calendar db to 305"