Merge "Relax too strong DCHECK."