Merge "Add columns to CalendarContract" into jb-mr1-dev