Merge "Add hidden API to prepare for increasing calendar support"