jni: Misc updates merged from jb-mr1.1-release