Merge "crash_dump: avoid misleading error messages."