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

Change-Id: I55edc10580bee2906327f5c64335276e6a7f4af8