Merge "Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)"