Merge "Fix broken DCHECK"