Merge "Fix broken DCHECK."