Merge "Fixes to FlpHal JNI layer." into klp-dev