Merge "Fix ISB field names in JNI"