Merge "Fix CalendarProvider2Test" into mnc-dev