Merge "Remove unneeded JNI method"