Merge "Add new Calendar APIs to fw" into ics-mr1