Merge "Deprecate internal Calendar methods." into oc-dev