Merge "Fix regression in crash reporting"