Merge "Fix for issue 4133431 "Remove OSAL layer" in JNI part"