Merge "Improve JNI indirect ref diagnostics"