Merge "Update jni with measurement_corrections 1.1"