Merge "jni: Added lame duck timeout option"