Merge "Wrong arguments for JNI call"