Merge \\"CalendarProvider2: log failures to get the cached calling package.\\" into nyc-dev am: bcc65b8d27
am: e34e1daee9

Change-Id: I4531bcbb4c564f5eda603738f8acd57b26a3da80