Reconcile JF related blobs for reworked jf trees

from cm

Change-Id: Ia8dd666bde918ea0e5c095994eb0cde1cd17dd6e