Merge "fix for issue  4142219 Don't hard code platform-specific limitations-jni/java part"