Merge "Added JNI hack to support JNI hack"