Merge "Guard against crash in SummaryProvider" into nyc-dev