Merge "Fixup JNI" into ics-mr0