Merge "Pseudo-final api fixes to CalendarContract"