Merge "Fix failing check during JDWP invoke."