Merge change 4131 into donut

* changes:
  Fix the jni initializer.