Merge "Fix an assert during jdwp debugging." into nyc-dev