Merge "Fix an assert during jdwp debugging."