Merge "tombstone: log output header suppressed in crash"